SF.net SVN: fclient: [461] trunk/fcp2/src/fcp2/message.py

[<jU...@us...>]

Revision: 461
          http://fclient.svn.sourceforge.net/fclient/?rev=461&view=rev
Author:   jUrner
Date:     2008-07-01 04:27:41 -0700 (Tue, 01 Jul 2008)

Log Message:
-----------
for ease of use, all necessary symbols are now imported to main

Modified Paths:
--------------
    trunk/fcp2/src/fcp2/message.py

Modified: trunk/fcp2/src/fcp2/message.py
===================================================================
--- trunk/fcp2/src/fcp2/message.py	2008-07-01 11:27:35 UTC (rev 460)
+++ trunk/fcp2/src/fcp2/message.py	2008-07-01 11:27:41 UTC (rev 461)
@@ -15,13 +15,14 @@
 hack = _RelImportHack(2)
 
 from fcp2 import consts
+from fcp2 import config
 from fcp2 import types
 from fcp2 import key
 from fcp2.fcp_lib import node
 from fcp2.fcp_lib import uuid
 
 
-del hack
+del hack, _RelImportHack
 #<-- rel import hack
 #********************************************************************************
 # consts
@@ -32,20 +33,20 @@
 #********************************************************************************
 #
 #********************************************************************************
-class Node(node.Node):
-	"""Node tree used along with messages"""
+class _Node(node.Node):
+	"""_Node tree used along with messages"""
 	ComponentSep = '.'
 
 #********************************************************************************
 #
 #********************************************************************************
-class PrivateParam(str):
-	"""Helper class to mark a message parameter as PrivateParam to the package"""
+class _PrivateParam(str):
+	"""Helper class to mark a message parameter as _PrivateParam to the package"""
 
 #********************************************************************************
 #
 #********************************************************************************
-class MessageMeta(type):
+class _PMessageMeta(type):
 	
 	def __new__(klass, name, bases, kws):
 		newClass = type.__new__(klass, name, bases, kws)
@@ -58,7 +59,7 @@
 #********************************************************************************
 #
 #********************************************************************************
-class MessageBase(object):
+class _PMessageBase(object):
 	"""Class wrapping a Fcp message
 			
 	Sample use::
@@ -76,7 +77,7 @@
 	@ivar name: (str) message name
 	@ivar params: (dict) message params
 	"""
-	__metaclass__ = MessageMeta	
+	__metaclass__ = _PMessageMeta	
 	
 	name = ''
 	_additional_params_ = {}		
@@ -123,7 +124,7 @@
 		"""Returns the message as nicely formated human readable string"""
 		out = ['', '>>' + self.name, ]
 		for param, value in self.params.items():
-			if isinstance(param, PrivateParam):
+			if isinstance(param, _PrivateParam):
 				continue
 			
 			# convert python to fcp value if necessary
@@ -145,7 +146,7 @@
 		"""Returns the message as formated string ready to be send"""
 		out = [self.name, ]
 		for param, value in self.params.items():
-			if isinstance(param, PrivateParam):
+			if isinstance(param, _PrivateParam):
 				continue
 			
 			# convert python to fcp value if necessary
@@ -165,12 +166,12 @@
 	
 	def toTree(self):
 		"""Converts message params to a tree of nodes
-		@return: (L{Node}) root node
+		@return: (L{_Node}) root node
 		
 		@note: some messages have hirarchicaly organized (dotted) parameters. Use this
 		method to convert the parameters to a tree of nodes
 		"""
-		node_ = Node()
+		node_ = _Node()
 		for name, value in self.params.iteritems():
 			node_[name] = value
 		
@@ -213,211 +214,7 @@
 		
 	def _getDataLength(self):
 		return 0
-		
 
-#***************************************************************************************
-#
-# param types for config message
-#
-# ..bit more efford here, cos we need types for user input checking
-# ...a sloppy implementation of a dict should be enough
-#
-#***************************************************************************************
-class _ConfigMessageParamTypes(object):
-	"""Parameter --> FcpType mapping for config related messages
-	
-	@note: we use this instead of _param_types_ dict to handle param classes
-	in L{ConfigData} and L{ModifyConfig}
-	"""	
-	
-	
-	
-	# all known config keys (param class stripped)
-	Params = {
-		
-		'console.allowedHosts': types.FcpTypeIPList,		# host names, single IPs CIDR-maskip IPs likee 192.168.0.0/24
-		'console.bindTo': types.FcpTypeIPList,
-		'console.directEnabled': types.FcpTypeBool,
-		'console.enabled': types.FcpTypeBool,
-		'console.port': types.FcpTypeIPort,
-		'console.ssl': types.FcpTypeBool,
-				
-		'fcp.allowedHosts': types.FcpTypeIPList,
-		'fcp.allowedHostsFullAccess': types.FcpTypeIPList,
-		'fcp.assumeDownloadDDAIsAllowed': types.FcpTypeBool,
-		'fcp.assumeUploadDDAIsAllowed': types.FcpTypeBool,
-		'fcp.bindTo': types.FcpTypeIP,
-		'fcp.enabled': types.FcpTypeBool,
-		'fcp.persistentDownloadsEnabled': types.FcpTypeBool,
-		'fcp.persistentDownloadsFile': types.FcpTypeFilename,
-		'fcp.persistentDownloadsInterval': types.FcpTypeTimeDelta,
-		'fcp.port': types.FcpTypeIPort,
-		'fcp.ssl': types.FcpTypeBool,
-				
-		'fproxy.CSSOverride': types.FcpTypeBool,
-		'fproxy.advancedModeEnabled': types.FcpTypeBool,
-		'fproxy.allowedHosts': types.FcpTypeIPList,
-		'fproxy.allowedHostsFullAccess': types.FcpTypeIPList,
-		'fproxy.bindTo': types.FcpTypeIPList,
-		'fproxy.css': types.FcpTypeChoiceFProxyCss,
-		'fproxy.doRobots': types.FcpTypeBool,
-		'fproxy.enabled': types.FcpTypeBool,
-		'fproxy.javascriptEnabled': types.FcpTypeBool,
-		'fproxy.port': types.FcpTypeIPort,
-		'fproxy.showPanicButton': types.FcpTypeBool,
-		'fproxy.ssl': types.FcpTypeBool,
-				
-		'logger.dirname': types.FcpTypeDirname,
-		'logger.enabled': types.FcpTypeBool,
-		'logger.interval': types.FcpTypeTimeDelta,
-		'logger.maxCachedBytes': types.FcpTypeByteAmount,
-		'logger.maxCachedLines': types.FcpTypeByteAmount,									# ???
-		'logger.maxZippedLogsSize': types.FcpTypeByteAmount, 							# ???
-		'logger.priority': types.FcpTypeChoiceLoggerPriority,
-		'logger.priorityDetail': types.FcpType,													# ???? is it Detailed priority thresholds ???
-				
-		'node.alwaysAllowLocalAddresses': types.FcpTypeBool,
-		'node.assumeNATed': types.FcpTypeBool,
-		'node.bindTo': types.FcpTypeIP,
-		'node.clientThrottleFile': types.FcpTypeFilename,
-		'node.databaseMaxMemory': types.FcpTypeByteAmount,
-		'node.disableHangCheckers': types.FcpTypeBool,
-		'node.disableProbabilisticHTLs': types.FcpTypeBool,
-		'node.downloadAllowedDirs': types.FcpTypeChoiceNodeDownloadAllowedDirs,
-		'node.downloadsDir': types.FcpTypeDirname,
-		'node.enableARKs': types.FcpTypeBool,
-		'node.enablePacketCoalescing': types.FcpTypeBool,
-		'node.enablePerNodeFailureTables': types.FcpTypeBool,
-		'node.enableSwapping': types.FcpTypeBool,
-		'node.enableSwapQueueing': types.FcpTypeBool,
-		'node.enableULPRDataPropagation': types.FcpTypeBool,
-		'node.extraPeerDataDir': types.FcpTypeDirname,
-		'node.includeLocalAddressesInNoderefs': types.FcpTypeBool,
-		'node.inputBandwidthLimit': types.FcpTypeByteAmount,								# -1 is possible as value aswell
-		'node.ipAddressOverride': types.FcpTypeIP,
-		'node.l10n': types.FcpType,																			# ???
-		'node.lazyResume': types.FcpTypeBool,
-		'node.listenPort': types.FcpTypeIPort,
-		'node.maxBackgroundUSKFetchers': types.FcpTypeIntWithBounds(0, None),
-		'node.maxHTL': types.FcpTypeIntWithBounds(0, None),
-		'node.name': types.FcpTypeString,
-		'node.nodeDir': types.FcpTypeDirname,
-		'node.oneConnectionPerIP': types.FcpTypeBool,
-		'node.outputBandwidthLimit': types.FcpTypeByteAmount,
-		'node.passOpennetPeersThroughDarknet': types.FcpTypeBool,
-		'node.persistentTempDir': types.FcpTypeDirname,
-		'node.storeDir': types.FcpTypeDirname,
-		'node.storeForceBigShrinks': types.FcpTypeBool,
-		'node.storeSize': types.FcpTypeByteAmount,
-		'node.storeType': types.FcpTypeString,
-		'node.tempDir': types.FcpTypeDirname,
-		'node.tempIPAddressHint': types.FcpTypeIP,													# ???
-		'node.testingDropPacketsEvery': types.FcpTypeIntWithBounds(0, None),
-		'node.uploadAllowedDirs': types.FcpTypeChoiceNodeDownloadAllowedDirs,
-			
-		'node.testnet.enabled': types.FcpTypeBool,
-				
-		'node.load.aggressiveGC': types.FcpType,														# ???
-		'node.load.freeHeapBytesThreshold': types.FcpTypeByteAmount,
-		'node.load.freeHeapPercentThreshold': types.FcpTypePercent,
-		'node.load.memoryChecker': types.FcpTypeBool,
-		'node.load.nodeThrottleFile': types.FcpTypeFilename,
-		'node.load.threadLimit': types.FcpTypeIntWithBounds(0, None),
-				
-		'node.opennet.acceptSeedConnections': types.FcpTypeBool,
-		'node.opennet.alwaysAllowLocalAddresses': types.FcpTypeBool,
-		'node.opennet.assumeNATed': types.FcpTypeBool,
-		'node.opennet.bindTo': types.FcpTypeIP,
-		'node.opennet.enabled': types.FcpTypeBool,
-		'node.opennet.listenPort': types.FcpTypeIPort,
-		'node.opennet.maxOpennetPeers': types.FcpTypeIntWithBounds(0, None),
-		'node.opennet.oneConnectionPerIP': types.FcpTypeBool,
-		'node.opennet.testingDropPacketsEvery': types.FcpTypeIntWithBounds(0, None),
-				
-		'node.scheduler.CHKinserter_priority_policy': types.FcpTypeChoicePriorityPolicy,
-		'node.scheduler.CHKrequester_priority_policy': types.FcpTypeChoicePriorityPolicy,
-		'node.scheduler.SSKinserter_priority_policy': types.FcpTypeChoicePriorityPolicy,
-		'node.scheduler.SSKrequester_priority_policy': types.FcpTypeChoicePriorityPolicy,
-		
-		'node.updater.URI': key.FcpTypeKey,
-		'node.updater.autoupdate': types.FcpTypeBool,
-		'node.updater.enabled': types.FcpTypeBool,
-		'node.updater.extURI': key.FcpTypeKey,
-		'node.updater.revocationURI': key.FcpTypeKey,
-				
-		'pluginmanager.loadplugin': types.FcpTypeStringList,
-		'pluginmanager2.loadedPlugins': types.FcpTypeStringList,
-						
-		'ssl.sslEnable': types.FcpTypeBool,
-		'ssl.sslKeyPass': types.FcpTypeString,
-		'ssl.sslKeyStore': types.FcpTypeFilename,
-		'ssl.sslKeyStorePass': types.FcpTypeString,
-		'ssl.sslVersion': types.FcpTypeChoiceSSLVersion,
-		
-		'toadletsymlinker.symlinks': types.FcpTypeStringList,
-		}
-
-	def __init__(self):
-		pass
-	
-	def splitAll(self, paramName):
-		"""Splits a parameter name into its components
-		@param paramName: (str) parameter name to split
-		@return: (list) components
-		"""
-		return paramName.split(consts.ConfigKeySep)
-		
-	
-	def splitParamClass(self, paramName):
-		"""Splits the parameter class from a parameter name
-		@param paramName: (str) parameter name to split
-		@return: (tuple) paramClass, tail
-		"""
-		result = paramName.split(consts.ConfigKeySep, 1)
-		if len(result) == 2:
-			if result[0] in consts.ConfigValueClass.ClassesAll:
-				return result
-		return '', paramName
-		
-	
-	def get(self, paramName, default=None):
-		"""Returns the type of a parameter or default
-		@param paramName: (str) name of the parameter to retuen the type for
-		@return: (FcpType)
-		"""
-		try:
-			return self[paramName]
-		except KeyError:
-			return default
-		
-	
-	def __getitem__(self, paramName):
-		"""Returns the type of a parameter
-		@param paramName: (str) name of the parameter to retuen the type for
-		@return: (FcpType)
-		"""
-		paramClass, paramKey = self.splitParamClass(paramName)
-		if paramClass == consts.ConfigValueClass.Current or paramClass == '':
-			return self.Params[paramKey]
-		elif paramClass == consts.ConfigValueClass.Default:
-			return self.Params[paramKey]
-		elif paramClass == consts.ConfigValueClass.ExpertFlag:
-			return types.FcpTypeBool
-		elif paramClass == consts.ConfigValueClass.ForceWriteFlag:
-			return types.FcpTypeBool
-		elif paramClass == consts.ConfigValueClass.ShortDescription:
-			return types.FcpTypeString
-		elif paramClass == consts.ConfigValueClass.LongDescription:
-			return types.FcpTypeString
-		elif paramClass == consts.ConfigValueClass.SortOrder:
-			return types.FcpTypeInt
-		elif paramClass == consts.ConfigValueClass.DataType:
-			return types.FcpTypeString
-		else:
-			raise ValueError('Unknown param class in: %r' % paramName)
-
-ConfigMessageParamTypes = _ConfigMessageParamTypes()
-
 #********************************************************************************
 # at runtime we store a few additional params in msg.params
 #
@@ -425,88 +222,88 @@
 # as private so they don't get send to the node
 #
 #********************************************************************************
-AdditionalGetParams = {
+_GetParams = {
 				
 		# persistent params that will go into identifier
-		PrivateParam('RequestType'): consts.RequestType.Null,			# identifies sub message types
-		PrivateParam('InitTime'): 0,														# when was the request started?
-		PrivateParam('FilenameCollision'): consts.FilenameCollision.HandleNever,				# handle fielanem collisions?
-		PrivateParam('PersistentUserData'): '',									# any user defined persistent data
+		_PrivateParam('RequestType'): consts.ConstRequestType.Null,			# identifies sub message types
+		_PrivateParam('InitTime'): 0,														# when was the request started?
+		_PrivateParam('FilenameCollision'): consts.ConstFilenameCollision.HandleNever,				# handle fielanem collisions?
+		_PrivateParam('PersistentUserData'): '',									# any user defined persistent data
 						
 		# non persistent params
-		PrivateParam('RequestStatus'): consts.RequestStatus.Null,
-		PrivateParam('ErrorMessage'): None,											# error message in case an error occured
-		PrivateParam('UserData'): None,													# any user defined runtime data here
+		_PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
+		_PrivateParam('ErrorMessage'): None,											# error message in case an error occured
+		_PrivateParam('UserData'): None,													# any user defined runtime data here
 		
 		# params from DataFound
-		PrivateParam('MetadataContentType'): '',									# content type
-		PrivateParam('MetadataSize'): 0,												# content size
+		_PrivateParam('MetadataContentType'): '',									# content type
+		_PrivateParam('MetadataSize'): 0,												# content size
 				
 		# params from PersistentRequestModified
-		PrivateParam('Modified'): {},
+		_PrivateParam('Modified'): {},
 						
 		# params for DDA test
-		PrivateParam('TestDDA'): {},
+		_PrivateParam('TestDDA'): {},
 		
 		# params for SimpleProgress
-		PrivateParam('ProgressTotal'): 0,
-		PrivateParam('ProgressRequired'): 0,
-		PrivateParam('ProgressFailed'): 0,
-		PrivateParam('ProgressFatalyFailed'): 0,
-		PrivateParam('ProgressSucceeeded'): 0,
+		_PrivateParam('ProgressTotal'): 0,
+		_PrivateParam('ProgressRequired'): 0,
+		_PrivateParam('ProgressFailed'): 0,
+		_PrivateParam('ProgressFatalyFailed'): 0,
+		_PrivateParam('ProgressSucceeeded'): 0,
 	}
 
 
-AdditionalPutParams = {
+_PutParams = {
 				
 		# persistent params that will go into identifier
-		PrivateParam('RequestType'): consts.RequestType.Null,			# identifies sub message types
-		PrivateParam('InitTime'): 0,														# when was the request started?
+		_PrivateParam('RequestType'): consts.ConstRequestType.Null,			# identifies sub message types
+		_PrivateParam('InitTime'): 0,														# when was the request started?
 		
 		#TODO: not really necessary, but we need it for persistent params
-		PrivateParam('PersistentUserData'): '',									# any user defined persistent data
+		_PrivateParam('PersistentUserData'): '',									# any user defined persistent data
 						
 		# non persistent params
-		PrivateParam('RequestStatus'): consts.RequestStatus.Null,
-		PrivateParam('ErrorMessage'): None,											# error message in case an error occured
-		PrivateParam('UserData'): None,													# any user defined runtime data here
+		_PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
+		_PrivateParam('ErrorMessage'): None,											# error message in case an error occured
+		_PrivateParam('UserData'): None,													# any user defined runtime data here
 		
 		# params from DataFound
-		PrivateParam('MetadataContentType'): '',									# contecnt type
-		PrivateParam('MetadataSize'): 0,												# content size
+		_PrivateParam('MetadataContentType'): '',									# contecnt type
+		_PrivateParam('MetadataSize'): 0,												# content size
 				
 		# params from PersistentRequestModified
-		PrivateParam('Modified'): {},
+		_PrivateParam('Modified'): {},
 						
 		# params for DDA test
-		PrivateParam('TestDDA'): {},
+		_PrivateParam('TestDDA'): {},
 		
 		# params for SimpleProgress
-		PrivateParam('ProgressTotal'): 0,
-		PrivateParam('ProgressRequired'): 0,
-		PrivateParam('ProgressFailed'): 0,
-		PrivateParam('ProgressFatalyFailed'): 0,
-		PrivateParam('ProgressSucceeeded'): 0,
+		_PrivateParam('ProgressTotal'): 0,
+		_PrivateParam('ProgressRequired'): 0,
+		_PrivateParam('ProgressFailed'): 0,
+		_PrivateParam('ProgressFatalyFailed'): 0,
+		_PrivateParam('ProgressSucceeeded'): 0,
 	}
 
-AdditionalGenerateSSKParams = {
-		PrivateParam('RequestType'): consts.RequestType.Null,					# identifies sub message types
-		PrivateParam('RequestStatus'): consts.RequestStatus.Null,
-		PrivateParam('InitTime'): 0,																# when was the request started?
+_GenerateSSKParams = {
+		_PrivateParam('RequestType'): consts.ConstRequestType.Null,					# identifies sub message types
+		_PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
+		_PrivateParam('InitTime'): 0,																# when was the request started?
 		}
 
-AdditionalSubscribeUSKParams = {
-		PrivateParam('RequestType'): consts.RequestType.Null,					# identifies sub message types
-		PrivateParam('RequestStatus'): consts.RequestStatus.Null,
-		PrivateParam('InitTime'): 0,																# when was the request started?
-		PrivateParam('UserData'): None,
-		PrivateParam('Edition'): -1,
+_SubscribeUSKParams = {
+		_PrivateParam('RequestType'): consts.ConstRequestType.Null,					# identifies sub message types
+		_PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
+		_PrivateParam('InitTime'): 0,																# when was the request started?
+		_PrivateParam('UserData'): None,
+		_PrivateParam('Edition'): -1,
 		}
 
-AdditionalPluginInfoParams = {
-		PrivateParam('RequestType'): consts.RequestType.Null,					# identifies sub message types
-		PrivateParam('RequestStatus'): consts.RequestStatus.Null,
-		PrivateParam('InitTime'): 0,																# when was the request started?
+_PluginInfoParams = {
+		_PrivateParam('RequestType'): consts.ConstRequestType.Null,					# identifies sub message types
+		_PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
+		_PrivateParam('InitTime'): 0,																# when was the request started?
 		}
 
 #********************************************************************************
@@ -515,7 +312,7 @@
 # these params are stored in ClientToken
 #
 #********************************************************************************
-PersistentParamsGet = (
+_PersistentParamsGet = (
 		(
 				lambda msg: str(msg.__getitem__('RequestType')),
 				lambda msg, value: msg.__setitem__('RequestType', int(value)),
@@ -534,7 +331,7 @@
 			),
 		)
 
-PersistentParamsPut = (
+_PersistentParamsPut = (
 			(
 				lambda msg: str(msg.__getitem__('RequestType')),
 				lambda msg, value: msg.__setitem__('RequestType', int(value)),
@@ -559,27 +356,27 @@
 			'_persistent_params_':  () if persistentParams is None else persistentParams,
 			'_param_types_': {} if paramTypes is None else paramTypes,
 			}
-	return type(name, (MessageBase, ), kws)
+	return type(name, (_PMessageBase, ), kws)
 	
 #********************************************************************************
 # some messages defined by the client
 #********************************************************************************
-class ClientDisconnected(MessageBase):
-	name = consts.Message.ClientDisconnected
+class MsgClientDisconnected(_PMessageBase):
+	name = consts.ConstMessage.ClientDisconnected
 	_additional_params_ = {}
 	_param_types_ = {
-		'DisconnectReason': types.FcpTypeInt,
+		'DisconnectReason': types.TypeInt,
 		}
 
-class ClientSocketDied(MessageBase):
-	name = consts.Message.ClientSocketDied
+class MsgClientSocketDied(_PMessageBase):
+	name = consts.ConstMessage.ClientSocketDied
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 		
 		
-class ClientSocketTimeout(MessageBase):
-	name = consts.Message.ClientSocketTimeout
+class MsgClientSocketTimeout(_PMessageBase):
+	name = consts.ConstMessage.ClientSocketTimeout
 	_additional_params_ = {}
 	_param_types_ = {
 		}
@@ -587,33 +384,33 @@
 #********************************************************************************
 # fcp messages
 #********************************************************************************
-class AddPeer(MessageBase):
-	name = consts.Message.AddPeer
+class MsgAddPeer(_PMessageBase):
+	name = consts.ConstMessage.AddPeer
 	_additional_params_ = {}
 	_param_types_ = {
-		'ark.number': types.FcpTypeInt,
-		'auth.negTypes': types.FcpTypeInt,
-		'ark.pubURI': key.FcpTypeKey,
+		'ark.number': types.TypeInt,
+		'auth.negTypes': types.TypeInt,
+		'ark.pubURI': key.TypeKey,
 				
-		'location': types.FcpTypeFloat,
-		'opennet': types.FcpTypeBool,
-		'testnet': types.FcpTypeBool,	
+		'location': types.TypeFloat,
+		'opennet': types.TypeBool,
+		'testnet': types.TypeBool,	
 				
 		# passed in Peer message
-		'metadata.timeLastConnected': types.FcpTypeTime,
-		'metadata.timeLastReceivedPacket': types.FcpTypeTime,
-		'metadata.timeLastRoutable': types.FcpTypeTime,
-		'metadata.timeLastSuccess': types.FcpTypeTime,		
-		'metadata.routableConnectionCheckCount': types.FcpTypeInt,
-		'metadata.hadRoutableConnectionCount': types.FcpTypeInt,
+		'metadata.timeLastConnected': types.TypeTime,
+		'metadata.timeLastReceivedPacket': types.TypeTime,
+		'metadata.timeLastRoutable': types.TypeTime,
+		'metadata.timeLastSuccess': types.TypeTime,		
+		'metadata.routableConnectionCheckCount': types.TypeInt,
+		'metadata.hadRoutableConnectionCount': types.TypeInt,
 				
-		'volatile.averagePingTime': types.FcpTypeFloat,
-		'volatile.overloadProbability': types.FcpTypePercent,
-		'volatile.routingBackoff': types.FcpTypeInt,
-		'volatile.routingBackoffPercent': types.FcpTypePercent,
-		'volatile.totalBytesIn': types.FcpTypeInt,
-		'volatile.totalBytesOut': types.FcpTypeInt,
-		'volatile.routingBackoffLength': types.FcpTypeInt,
+		'volatile.averagePingTime': types.TypeFloat,
+		'volatile.overloadProbability': types.TypePercent,
+		'volatile.routingBackoff': types.TypeInt,
+		'volatile.routingBackoffPercent': types.TypePercent,
+		'volatile.totalBytesIn': types.TypeInt,
+		'volatile.totalBytesOut': types.TypeInt,
+		'volatile.routingBackoffLength': types.TypeInt,
 		}
 
 '''all other Peer message params here....
@@ -635,104 +432,104 @@
 '''
 		
 
-class AllData(MessageBase):
-	name = consts.Message.AllData
+class MsgAllData(_PMessageBase):
+	name = consts.ConstMessage.AllData
 	_additional_params_ = {}
 	_param_types_ = {
-		'DataLength': types.FcpTypeInt,
-		'Global': types.FcpTypeBool,
+		'DataLength': types.TypeInt,
+		'Global': types.TypeBool,
 		}
 		
 	def _getDataLength(self):
 		return self['DataLength']
 
 
-class ClientGet(MessageBase):
-	name = consts.Message.ClientGet
-	_additional_params_ = AdditionalGetParams
-	_persistent_params_ = PersistentParamsGet
+class MsgClientGet(_PMessageBase):
+	name = consts.ConstMessage.ClientGet
+	_additional_params_ = _GetParams
+	_persistent_params_ = _PersistentParamsGet
 	_param_types_ = {
-		'BinaryBlob': types.FcpTypeBool,
-		'DSOnly': types.FcpTypeBool,
-		'Global': types.FcpTypeBool,
-		'IgnoreDS': types.FcpTypeBool,
-		'MaxRetries': types.FcpTypeInt,
-		'MaxSize': types.FcpTypeInt,
-		'MaxTempSize': types.FcpTypeInt,
-		'URI': key.FcpTypeKey,
-		'Verbosity': types.FcpTypeInt,
+		'BinaryBlob': types.TypeBool,
+		'DSOnly': types.TypeBool,
+		'Global': types.TypeBool,
+		'IgnoreDS': types.TypeBool,
+		'MaxRetries': types.TypeInt,
+		'MaxSize': types.TypeInt,
+		'MaxTempSize': types.TypeInt,
+		'URI': key.TypeKey,
+		'Verbosity': types.TypeInt,
 		}
 		
 	def _restoreParams(self, params):
-		MessageBase._restoreParams(self, params)
+		_PMessageBase._restoreParams(self, params)
 		try:
-			MessageBase._setPersistentParams(self, self['ClientToken'])
+			_PMessageBase._setPersistentParams(self, self['ClientToken'])
 		except Exception, d:
 			#print Exception, d
 			return False
 		return True
 		
 	def updatePersistentParams(self):
-		self['ClientToken'] = MessageBase._getPersistentParams(self)
+		self['ClientToken'] = _PMessageBase._getPersistentParams(self)
 		
 
-class ClientHello(MessageBase):
-	name = consts.Message.ClientHello
+class MsgClientHello(_PMessageBase):
+	name = consts.ConstMessage.ClientHello
 	_additional_params_ = {}
 	_param_types_ = {
-		'ExpectedVersion': types.FcpTypeFloat,
+		'ExpectedVersion': types.TypeFloat,
 		}
 
 
-class ClientPut(MessageBase):
-	name = consts.Message.ClientPut
-	_additional_params_ = AdditionalPutParams
-	_persistent_params_ = PersistentParamsPut
+class MsgClientPut(_PMessageBase):
+	name = consts.ConstMessage.ClientPut
+	_additional_params_ = _PutParams
+	_persistent_params_ = _PersistentParamsPut
 	_param_types_ = {
-		'BinaryBlob': types.FcpTypeBool,
-		'DataLength': types.FcpTypeInt,
-		'DontCompress': types.FcpTypeBool,
-		'EarlyEncode': types.FcpTypeBool,
-		'GetCHKOnly': types.FcpTypeBool,
-		'Global': types.FcpTypeBool,
-		'MaxRetries': types.FcpTypeInt,
-		'URI': key.FcpTypeKey,
-		'Verbosity': types.FcpTypeInt,
+		'BinaryBlob': types.TypeBool,
+		'DataLength': types.TypeInt,
+		'DontCompress': types.TypeBool,
+		'EarlyEncode': types.TypeBool,
+		'GetCHKOnly': types.TypeBool,
+		'Global': types.TypeBool,
+		'MaxRetries': types.TypeInt,
+		'URI': key.TypeKey,
+		'Verbosity': types.TypeInt,
 		}
 	
 	def _getDataLength(self):
 		return self['DataLength']
 		
 	def _restoreParams(self, params):
-		MessageBase._restoreParams(self, params)
+		_PMessageBase._restoreParams(self, params)
 		try:
-			MessageBase._setPersistentParams(self, self['ClientToken'])
+			_PMessageBase._setPersistentParams(self, self['ClientToken'])
 		except Exception, d:
 			#print Exception, d
 			return False
 		return True
 				
 	def updatePersistentParams(self):
-		self['ClientToken'] = MessageBase._getPersistentParams(self)
+		self['ClientToken'] = _PMessageBase._getPersistentParams(self)
 
 
-class ClientPutComplexDir(ClientPut):
-	name = consts.Message.ClientPutComplexDir
+class MsgClientPutComplexDir(MsgClientPut):
+	name = consts.ConstMessage.ClientPutComplexDir
 	
 	
 	def __init__(self, *args, **kwargs):
-		ClientPut.__init__(self, *args, **kwargs)
+		MsgClientPut.__init__(self, *args, **kwargs)
 		self._dataLength = 0
 		
 		
 	def _restoreParams(self, params):
-		result = ClientPut._restoreParams(self, params)
+		result = MsgClientPut._restoreParams(self, params)
 			
 		for paramName, paramValue in self.params.items():
 			tmp_paramName  = paramName.split('.')
 			if len(tmp_paramName) == 3:
 				if tmp_paramName[-1] == 'DataLength':
-					n = types.FcpTypeInt.fcpToPython(paramValue)
+					n = types.TypeInt.fcpToPython(paramValue)
 					self._dataLength += n
 					self[paramName] = n
 		return result
@@ -743,302 +540,302 @@
 	
 	
 
-class ClientPutDiskDir(ClientPut):
-	name = consts.Message.ClientPutDiskDir
+class MsgClientPutDiskDir(MsgClientPut):
+	name = consts.ConstMessage.ClientPutDiskDir
 		
 
-class CloseConnectionDuplicateClientName(MessageBase):
-	name = consts.Message.CloseConnectionDuplicateClientName
+class MsgCloseConnectionDuplicateClientName(_PMessageBase):
+	name = consts.ConstMessage.CloseConnectionDuplicateClientName
 	_additional_params_ = {}
 	_param_types_ = {
 		}	
 		
 #########################################
 #########################################
-class ConfigData(MessageBase):
-	name = consts.Message.ConfigData
+class MsgConfigData(_PMessageBase):
+	name = consts.ConstMessage.ConfigData
 	_additional_params_ = {}
-	_param_types_ = ConfigMessageParamTypes
+	_param_types_ = config._ConfigMessageParamTypes
 
 
-class DataFound(MessageBase):
-	name = consts.Message.DataFound
+class MsgDataFound(_PMessageBase):
+	name = consts.ConstMessage.DataFound
 	_additional_params_ = {}
 	_param_types_ = {
-		'DataLength': types.FcpTypeInt,
-		'Global': types.FcpTypeBool,
+		'DataLength': types.TypeInt,
+		'Global': types.TypeBool,
 		}
 
 
-class EndListPeerNotes(MessageBase):
-	name = consts.Message.EndListPeerNotes
+class MsgEndListPeerNotes(_PMessageBase):
+	name = consts.ConstMessage.EndListPeerNotes
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 		
 		
-class EndListPeers(MessageBase):
-	name = consts.Message.EndListPeers
+class MsgEndListPeers(_PMessageBase):
+	name = consts.ConstMessage.EndListPeers
 	_additional_params_ = {}
 	_param_types_ = {
 		}	
 		
 
-class EndListPersistentRequests(MessageBase):
-	name = consts.Message.EndListPersistentRequests
+class MsgEndListPersistentRequests(_PMessageBase):
+	name = consts.ConstMessage.EndListPersistentRequests
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 
 
-class FCPPluginMessage(MessageBase):
-	name = consts.Message.FCPPluginMessage
+class MsgFCPPluginMessage(_PMessageBase):
+	name = consts.ConstMessage.FCPPluginMessage
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 
 
-class FCPPluginReply(MessageBase):
-	name = consts.Message.FCPPluginReply
+class MsgFCPPluginReply(_PMessageBase):
+	name = consts.ConstMessage.FCPPluginReply
 	_additional_params_ = {}
 	_param_types_ = {
-		'DataLength': types.FcpTypeInt,
+		'DataLength': types.TypeInt,
 		}
 
 
-class FinishedCompression(MessageBase):
-	name = consts.Message.FinishedCompression
+class MsgFinishedCompression(_PMessageBase):
+	name = consts.ConstMessage.FinishedCompression
 	_additional_params_ = {}
 	_param_types_ = {
-		'CompressedSize': types.FcpTypeInt,
-		'OriginalSize': types.FcpTypeInt,
+		'CompressedSize': types.TypeInt,
+		'OriginalSize': types.TypeInt,
 		}
 
 
-class GenerateSSK(MessageBase):
-	name = consts.Message.GenerateSSK
-	_additional_params_ = AdditionalGenerateSSKParams
+class MsgGenerateSSK(_PMessageBase):
+	name = consts.ConstMessage.GenerateSSK
+	_additional_params_ = _GenerateSSKParams
 	_param_types_ = {
 		}
 
 
-class GetConfig(MessageBase):
-	name = consts.Message.GetConfig
+class MsgGetConfig(_PMessageBase):
+	name = consts.ConstMessage.GetConfig
 	_additional_params_ = {}
 	_param_types_ = {
-		'WithCurrent': types.FcpTypeBool,
-		'WithDefaults': types.FcpTypeBool,
-		'WithExpertFlag': types.FcpTypeBool,
-		'WithForceWriteFlag': types.FcpTypeBool,
-		'WithLongDescription': types.FcpTypeBool,
-		'WithShortDescription': types.FcpTypeBool,
-		'WithSortOrder': types.FcpTypeBool,
-		'WithDataTypes': types.FcpTypeBool,
+		'WithCurrent': types.TypeBool,
+		'WithDefaults': types.TypeBool,
+		'WithExpertFlag': types.TypeBool,
+		'WithForceWriteFlag': types.TypeBool,
+		'WithLongDescription': types.TypeBool,
+		'WithShortDescription': types.TypeBool,
+		'WithSortOrder': types.TypeBool,
+		'WithDataTypes': types.TypeBool,
 		}
 
 
-class GetFailed(MessageBase):
-	name = consts.Message.GetFailed
+class MsgGetFailed(_PMessageBase):
+	name = consts.ConstMessage.GetFailed
 	_additional_params_ = {}
 	_param_types_ = {
-		'Code': types.FcpTypeInt,
-		'ExpectedDataLength': types.FcpTypeInt_GetFailed_ExpectedDataLenght,
-		'Fatal': types.FcpTypeBool,
-		'FinalizedExpected': types.FcpTypeBool,
-		'Global': types.FcpTypeBool,
-		'RedirectURI': key.FcpTypeKey,
+		'Code': types.TypeInt,
+		'ExpectedDataLength': types.TypeInt_GetFailed_ExpectedDataLenght,
+		'Fatal': types.TypeBool,
+		'FinalizedExpected': types.TypeBool,
+		'Global': types.TypeBool,
+		'RedirectURI': key.TypeKey,
 		}
 
 
-class GetNode(MessageBase):
-	name = consts.Message.GetNode
+class MsgGetNode(_PMessageBase):
+	name = consts.ConstMessage.GetNode
 	_additional_params_ = {}
 	_param_types_ = {
-		'GiveOpennetRef': types.FcpTypeBool,
-		'WithPrivate': types.FcpTypeBool,
-		'WithVolatile': types.FcpTypeBool,
+		'GiveOpennetRef': types.TypeBool,
+		'WithPrivate': types.TypeBool,
+		'WithVolatile': types.TypeBool,
 		}
 
 
-class GetPluginInfo(MessageBase):
-	name = consts.Message.GetPluginInfo
-	_additional_params_ = AdditionalPluginInfoParams
+class MsgGetPluginInfo(_PMessageBase):
+	name = consts.ConstMessage.GetPluginInfo
+	_additional_params_ = _PluginInfoParams
 	_param_types_ = {
-		'Started': types.FcpTypeBool,
+		'Started': types.TypeBool,
 		}
 
 
-class GetRequestStatus(MessageBase):
-	name = consts.Message.GetRequestStatus
+class MsgGetRequestStatus(_PMessageBase):
+	name = consts.ConstMessage.GetRequestStatus
 	_additional_params_ = {}
 	_param_types_ = {
-		'Global': types.FcpTypeBool,
-		'OnlyData': types.FcpTypeBool,
+		'Global': types.TypeBool,
+		'OnlyData': types.TypeBool,
 		}
 
 
-class IdentifierCollision(MessageBase):
-	name = consts.Message.IdentifierCollision
+class MsgIdentifierCollision(_PMessageBase):
+	name = consts.ConstMessage.IdentifierCollision
 	_additional_params_ = {}
 	_param_types_ = {
-		'Global': types.FcpTypeBool,
+		'Global': types.TypeBool,
 		}
 
 
-class ListPeer(MessageBase):
-	name = consts.Message.ListPeer
+class MsgListPeer(_PMessageBase):
+	name = consts.ConstMessage.ListPeer
 	_additional_params_ = {}
 	_param_types_ = {
-		'WithMetadata': types.FcpTypeBool,
-		'WithVolantile': types.FcpTypeBool,
+		'WithMetadata': types.TypeBool,
+		'WithVolantile': types.TypeBool,
 		}
 
 
-class ListPeerNotes(MessageBase):
-	name = consts.Message.ListPeerNotes
+class MsgListPeerNotes(_PMessageBase):
+	name = consts.ConstMessage.ListPeerNotes
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 
 
 
-class ListPeers(MessageBase):
-	name = consts.Message.ListPeers
+class MsgListPeers(_PMessageBase):
+	name = consts.ConstMessage.ListPeers
 	_additional_params_ = {}
 	_param_types_ = {
-		'WithMetadata': types.FcpTypeBool,
-		'WithVolantile': types.FcpTypeBool,
+		'WithMetadata': types.TypeBool,
+		'WithVolantile': types.TypeBool,
 		}
 
 
-class ListPersistentRequests(MessageBase):
-	name = consts.Message.ListPersistentRequests
+class MsgListPersistentRequests(_PMessageBase):
+	name = consts.ConstMessage.ListPersistentRequests
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 		
 #####################################
 #####################################
-class ModifyConfig(MessageBase):
-	name = consts.Message.ModifyConfig
+class MsgModifyConfig(_PMessageBase):
+	name = consts.ConstMessage.ModifyConfig
 	_additional_params_ = {}
-	_param_types_ = ConfigMessageParamTypes
+	_param_types_ = config._ConfigMessageParamTypes
 	
 #####################################
 #####################################
-class ModifyPeer(MessageBase):
-	name = consts.Message.ModifyPeer
+class MsgModifyPeer(_PMessageBase):
+	name = consts.ConstMessage.ModifyPeer
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 		
 
-class ModifyPeerNote(MessageBase):
-	name = consts.Message.ModifyPeerNote
+class MsgModifyPeerNote(_PMessageBase):
+	name = consts.ConstMessage.ModifyPeerNote
 	_additional_params_ = {}
 	_param_types_ = {
-		#'Peernotetype': types.FcpTypeInt,		#????
+		#'Peernotetype': types.TypeInt,		#????
 		}
 
 
-class ModifyPersistentRequest(MessageBase):
-	name = consts.Message.ModifyPersistentRequest
+class MsgModifyPersistentRequest(_PMessageBase):
+	name = consts.ConstMessage.ModifyPersistentRequest
 	_additional_params_ = {}
 	_param_types_ = {
-		'Global': types.FcpTypeBool,
+		'Global': types.TypeBool,
 		}
 
 ###################################
 ###################################
-class NodeData(MessageBase):
-	name = consts.Message.NodeData
+class MsgNodeData(_PMessageBase):
+	name = consts.ConstMessage.NodeData
 	_additional_params_ = {}
 	_param_types_ = {
-		'ark.number': types.FcpTypeInt,
-		'ark.privURI': key.FcpTypeKey,
-		'auth.negTypes': types.FcpTypeInt,
-		'location': types.FcpTypeFloat,
-		'opennet': types.FcpTypeBool,
-		'testnet': types.FcpTypeBool,
+		'ark.number': types.TypeInt,
+		'ark.privURI': key.TypeKey,
+		'auth.negTypes': types.TypeInt,
+		'location': types.TypeFloat,
+		'opennet': types.TypeBool,
+		'testnet': types.TypeBool,
 				
-		'volatile.allocatedJavaMemory': types.FcpTypeInt,
-		'volatile.availableCPUs': types.FcpTypeInt,
-		'volatile.averagePingTime': types.FcpTypeFloat,
-		'volatile.avgStoreAccessRate': types.FcpTypePercent,
-		'volatile.backedOffPercent': types.FcpTypePercent,
-		'volatile.bwlimitDelayTime': types.FcpTypeFloat,
-		'volatile.cacheAccess': types.FcpTypeInt,
-		'volatile.cachedKeys': types.FcpTypeInt,
-		'volatile.cachedSize': types.FcpTypeInt,
-		'volatile.cachedStoreHits': types.FcpTypeInt,
-		'volatile.cachedStoreMisses': types.FcpTypeInt,
-		'volatile.freeJavaMemory': types.FcpTypeInt,
-		'volatile.isUsingWrapper': types.FcpTypeBool,
-		'volatile.locationChangePerMinute': types.FcpTypeFloat,
-		'volatile.locationChangePerSession': types.FcpTypeFloat,
-		'volatile.locationChangePerSwap': types.FcpTypeFloat,
-		'volatile.maximumJavaMemory': types.FcpTypeInt,
-		'volatile.maxOverallKeys': types.FcpTypeInt,
-		'volatile.maxOverallSize': types.FcpTypeInt,
-		'volatile.networkSizeEstimate24hourRecent': types.FcpTypeInt,
-		'volatile.networkSizeEstimate48hourRecent': types.FcpTypeInt,
-		'volatile.networkSizeEstimateSession': types.FcpTypeInt,
-		'volatile.noSwaps': types.FcpTypeFloat,
-		'volatile.noSwapsPerMinute': types.FcpTypeFloat,
-		'volatile.numberOfARKFetchers': types.FcpTypeInt,
-		'volatile.numberOfBursting': types.FcpTypeInt,
-		'volatile.numberOfConnected': types.FcpTypeInt,
-		'volatile.numberOfDisabled': types.FcpTypeInt,
-		'volatile.numberOfDisconnected': types.FcpTypeInt,
-		'volatile.numberOfInsertSenders': types.FcpTypeInt,
-		'volatile.numberOfListening': types.FcpTypeInt,
-		'volatile.numberOfListenOnly': types.FcpTypeInt,
-		'volatile.numberOfNeverConnected': types.FcpTypeInt,
-		'volatile.numberOfNotConnected': types.FcpTypeInt,
-		'volatile.numberOfRemotePeerLocationsSeenInSwaps': types.FcpTypeFloat,
-		'volatile.numberOfRequestSenders': types.FcpTypeInt,
-		 'volatile.numberOfRoutingBackedOff': types.FcpTypeInt,
-		'volatile.numberOfSimpleConnected': types.FcpTypeInt,
-		'volatile.numberOfTooNew': types.FcpTypeInt,
-		'volatile.numberOfTooOld': types.FcpTypeInt,
-		'volatile.numberOfTransferringRequestSenders': types.FcpTypeInt,
-		'volatile.numberWithRoutingBackoffReasons.ForwardRejectedOverload': types.FcpTypeInt,
-		'volatile.overallAccesses': types.FcpTypeInt,
-		 'volatile.overallKeys': types.FcpTypeInt,
-		'volatile.overallSize': types.FcpTypeInt,
-		'volatile.percentCachedStoreHitsOfAccesses': types.FcpTypePercent,
-		'volatile.percentOverallKeysOfMax': types.FcpTypePercent,
-		'volatile.percentStoreHitsOfAccesses': types.FcpTypePercent,
-		'volatile.pInstantReject': types.FcpTypeFloat,		# or percent?
-		'volatile.recentInputRate': types.FcpTypeFloat,
-		'volatile.recentOutputRate': types.FcpTypeFloat,
-		'volatile.routingMissDistance': types.FcpTypeFloat,
-		'volatile.runningThreadCount': types.FcpTypeInt,
-		'volatile.startedSwaps': types.FcpTypeInt,
-		'volatile.startupTime': types.FcpTypeTime,
-		'volatile.storeAccesses': types.FcpTypeInt,
-		'volatile.storeHits': types.FcpTypeInt,
-		'volatile.storeKeys': types.FcpTypeInt,
-		'volatile.storeMisses': types.FcpTypeInt,
-		'volatile.storeSize': types.FcpTypeInt,
-		'volatile.swaps': types.FcpTypeFloat,
-		'volatile.swapsPerMinute': types.FcpTypeFloat,
-		'volatile.swapsPerNoSwaps': types.FcpTypeFloat,
-		'volatile.swapsRejectedAlreadyLocked': types.FcpTypeInt,
-		'volatile.swapsRejectedLoop': types.FcpTypeInt,
-		'volatile.swapsRejectedNowhereToGo': types.FcpTypeInt,
-		'volatile.swapsRejectedRateLimit': types.FcpTypeInt,
-		'volatile.swapsRejectedRecognizedID': types.FcpTypeInt,
-		'volatile.totalInputBytes': types.FcpTypeInt,
-		'volatile.totalInputRate': types.FcpTypeInt,
-		'volatile.totalOutputBytes': types.FcpTypeInt,
-		'volatile.totalOutputRate': types.FcpTypeInt,
-		'volatile.totalPayloadOutputBytes': types.FcpTypeInt,
-		'volatile.totalPayloadOutputPercent': types.FcpTypePercent,
-		'volatile.totalPayloadOutputRate': types.FcpTypeInt,
-		'volatile.unclaimedFIFOSize': types.FcpTypeInt,
-		'volatile.uptimeSeconds': types.FcpTypeInt,
-		'volatile.usedJavaMemory': types.FcpTypeInt,
+		'volatile.allocatedJavaMemory': types.TypeInt,
+		'volatile.availableCPUs': types.TypeInt,
+		'volatile.averagePingTime': types.TypeFloat,
+		'volatile.avgStoreAccessRate': types.TypePercent,
+		'volatile.backedOffPercent': types.TypePercent,
+		'volatile.bwlimitDelayTime': types.TypeFloat,
+		'volatile.cacheAccess': types.TypeInt,
+		'volatile.cachedKeys': types.TypeInt,
+		'volatile.cachedSize': types.TypeInt,
+		'volatile.cachedStoreHits': types.TypeInt,
+		'volatile.cachedStoreMisses': types.TypeInt,
+		'volatile.freeJavaMemory': types.TypeInt,
+		'volatile.isUsingWrapper': types.TypeBool,
+		'volatile.locationChangePerMinute': types.TypeFloat,
+		'volatile.locationChangePerSession': types.TypeFloat,
+		'volatile.locationChangePerSwap': types.TypeFloat,
+		'volatile.maximumJavaMemory': types.TypeInt,
+		'volatile.maxOverallKeys': types.TypeInt,
+		'volatile.maxOverallSize': types.TypeInt,
+		'volatile.networkSizeEstimate24hourRecent': types.TypeInt,
+		'volatile.networkSizeEstimate48hourRecent': types.TypeInt,
+		'volatile.networkSizeEstimateSession': types.TypeInt,
+		'volatile.noSwaps': types.TypeFloat,
+		'volatile.noSwapsPerMinute': types.TypeFloat,
+		'volatile.numberOfARKFetchers': types.TypeInt,
+		'volatile.numberOfBursting': types.TypeInt,
+		'volatile.numberOfConnected': types.TypeInt,
+		'volatile.numberOfDisabled': types.TypeInt,
+		'volatile.numberOfDisconnected': types.TypeInt,
+		'volatile.numberOfInsertSenders': types.TypeInt,
+		'volatile.numberOfListening': types.TypeInt,
+		'volatile.numberOfListenOnly': types.TypeInt,
+		'volatile.numberOfNeverConnected': types.TypeInt,
+		'volatile.numberOfNotConnected': types.TypeInt,
+		'volatile.numberOfRemotePeerLocationsSeenInSwaps': types.TypeFloat,
+		'volatile.numberOfRequestSenders': types.TypeInt,
+		 'volatile.numberOfRoutingBackedOff': types.TypeInt,
+		'volatile.numberOfSimpleConnected': types.TypeInt,
+		'volatile.numberOfTooNew': types.TypeInt,
+		'volatile.numberOfTooOld': types.TypeInt,
+		'volatile.numberOfTransferringRequestSenders': types.TypeInt,
+		'volatile.numberWithRoutingBackoffReasons.ForwardRejectedOverload': types.TypeInt,
+		'volatile.overallAccesses': types.TypeInt,
+		 'volatile.overallKeys': types.TypeInt,
+		'volatile.overallSize': types.TypeInt,
+		'volatile.percentCachedStoreHitsOfAccesses': types.TypePercent,
+		'volatile.percentOverallKeysOfMax': types.TypePercent,
+		'volatile.percentStoreHitsOfAccesses': types.TypePercent,
+		'volatile.pInstantReject': types.TypeFloat,		# or percent?
+		'volatile.recentInputRate': types.TypeFloat,
+		'volatile.recentOutputRate': types.TypeFloat,
+		'volatile.routingMissDistance': types.TypeFloat,
+		'volatile.runningThreadCount': types.TypeInt,
+		'volatile.startedSwaps': types.TypeInt,
+		'volatile.startupTime': types.TypeTime,
+		'volatile.storeAccesses': types.TypeInt,
+		'volatile.storeHits': types.TypeInt,
+		'volatile.storeKeys': types.TypeInt,
+		'volatile.storeMisses': types.TypeInt,
+		'volatile.storeSize': types.TypeInt,
+		'volatile.swaps': types.TypeFloat,
+		'volatile.swapsPerMinute': types.TypeFloat,
+		'volatile.swapsPerNoSwaps': types.TypeFloat,
+		'volatile.swapsRejectedAlreadyLocked': types.TypeInt,
+		'volatile.swapsRejectedLoop': types.TypeInt,
+		'volatile.swapsRejectedNowhereToGo': types.TypeInt,
+		'volatile.swapsRejectedRateLimit': types.TypeInt,
+		'volatile.swapsRejectedRecognizedID': types.TypeInt,
+		'volatile.totalInputBytes': types.TypeInt,
+		'volatile.totalInputRate': types.TypeInt,
+		'volatile.totalOutputBytes': types.TypeInt,
+		'volatile.totalOutputRate': types.TypeInt,
+		'volatile.totalPayloadOutputBytes': types.TypeInt,
+		'volatile.totalPayloadOutputPercent': types.TypePercent,
+		'volatile.totalPayloadOutputRate': types.TypeInt,
+		'volatile.unclaimedFIFOSize': types.TypeInt,
+		'volatile.uptimeSeconds': types.TypeInt,
+		'volatile.usedJavaMemory': types.TypeInt,
 		}
 
 
@@ -1063,52 +860,52 @@
 
 	'''
 		
-class NodeHello(MessageBase):
-	name = consts.Message.NodeHello
+class MsgNodeHello(_PMessageBase):
+	name = consts.ConstMessage.NodeHello
 	_additional_params_ = {}
 	_param_types_ = {
-		'Build': types.FcpTypeInt,
-		'CompressionCodecs': types.FcpTypeInt,
-		'ExtBuild': types.FcpTypeInt,
-		'FCPVersion': types.FcpTypeFloat,
-		'Testnet': types.FcpTypeBool,
+		'Build': types.TypeInt,
+		'CompressionCodecs': types.TypeInt,
+		'ExtBuild': types.TypeInt,
+		'FCPVersion': types.TypeFloat,
+		'Testnet': types.TypeBool,
 		}
 
 #######################################
 #######################################
-class Peer(MessageBase):
-	name = consts.Message.Peer
+class MsgPeer(_PMessageBase):
+	name = consts.ConstMessage.Peer
 	_additional_params_ = {}
-	_param_types_ = AddPeer._param_types_
+	_param_types_ = MsgAddPeer._param_types_
 
 
-class PeerNote(MessageBase):
-	name = consts.Message.PeerNote
+class MsgPeerNote(_PMessageBase):
+	name = consts.ConstMessage.PeerNote
 	_additional_params_ = {}
 	_param_types_ = {
-		'NoteText': types.FcpTypeBase64EncodedString,
+		'NoteText': types.TypeBase64EncodedString,
 		}
 
 
-class PeerRemoved(MessageBase):
-	name = consts.Message.PeerRemoved
+class MsgPeerRemoved(_PMessageBase):
+	name = consts.ConstMessage.PeerRemoved
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 		
 #######################################
 #######################################
-class PersistentGet(MessageBase):
-	name = consts.Message.PersistentGet
-	_additional_params_ = AdditionalGetParams
-	_persistent_params_ = PersistentParamsGet
-	_param_types_ = ClientGet._param_types_.copy()
-	_param_types_['Started'] = types.FcpTypeBool
+class MsgPersistentGet(_PMessageBase):
+	name = consts.ConstMessage.PersistentGet
+	_additional_params_ = _GetParams
+	_persistent_params_ = _PersistentParamsGet
+	_param_types_ = MsgClientGet._param_types_.copy()
+	_param_types_['Started'] = types.TypeBool
 		
 	def _restoreParams(self, params):
-		MessageBase._restoreParams(self, params)
+		_PMessageBase._restoreParams(self, params)
 		try:
-			MessageBase._setPersistentParams(self, self['ClientToken'])
+			_PMessageBase._setPersistentParams(self, self['ClientToken'])
 		except Exception, d:
 			#print Exception, d
 			return False
@@ -1116,240 +913,244 @@
 
 #######################################
 #######################################
-class PersistentPut(MessageBase):
-	name = consts.Message.PersistentPut
-	_additional_params_ = AdditionalPutParams
-	_persistent_params_ = PersistentParamsPut
-	_param_types_ = ClientPut._param_types_.copy()
-	_param_types_['Started'] = types.FcpTypeBool	
+class MsgPersistentPut(_PMessageBase):
+	name = consts.ConstMessage.PersistentPut
+	_additional_params_ = _PutParams
+	_persistent_params_ = _PersistentParamsPut
+	_param_types_ = MsgClientPut._param_types_.copy()
+	_param_types_['Started'] = types.TypeBool	
 	
 	def _restoreParams(self, params):
-		MessageBase._restoreParams(self, params)
+		_PMessageBase._restoreParams(self, params)
 		try:
-			MessageBase._setPersistentParams(self, self['ClientToken'])
+			_PMessageBase._setPersistentParams(self, self['ClientToken'])
 		except Exception, d:
 			#print Exception, d
 			return False
 		return True
 	
 
-class PersistentPutDir(MessageBase):
-	name = consts.Message.PersistentPutDir
-	_additional_params_ = AdditionalPutParams
-	_persistent_params_ = PersistentParamsPut
-	_param_types_ = ClientPutDiskDir._param_types_.copy()
-	_param_types_['Started'] = types.FcpTypeBool	
+class MsgPersistentPutDir(_PMessageBase):
+	name = consts.ConstMessage.PersistentPutDir
+	_additional_params_ = _PutParams
+	_persistent_params_ = _PersistentParamsPut
+	_param_types_ = MsgClientPutDiskDir._param_types_.copy()
+	_param_types_['Started'] = types.TypeBool	
 	
 	
 	def _restoreParams(self, params):
-		MessageBase._restoreParams(self, params)
+		_PMessageBase._restoreParams(self, params)
 		
 		for paramName, paramValue in self.params.items():
 			tmp_paramName  = paramName.split('.')
 			if len(tmp_paramName) == 3:
 				if tmp_paramName[-1] == 'DataLength':
-					n = types.FcpTypeInt.fcpToPython(paramValue)
+					n = types.TypeInt.fcpToPython(paramValue)
 					self[paramName] = n
 		
 		try:
-			MessageBase._setPersistentParams(self, self['ClientToken'])
+			_PMessageBase._setPersistentParams(self, self['ClientToken'])
 		except Exception, d:
 			#print Exception, d
 			return False
 		return True
 		
 	
-class PersistentRequestModified(MessageBase):
-	name = consts.Message.PersistentRequestModified
+class MsgPersistentRequestModified(_PMessageBase):
+	name = consts.ConstMessage.PersistentRequestModified
 	_additional_params_ = {}
 	_param_types_ = {
-		'Global': types.FcpTypeBool,
+		'Global': types.TypeBool,
 		}
 
 
-class PersistentRequestRemoved(MessageBase):
-	name = consts.Message.PersistentRequestRemoved
+class MsgPersistentRequestRemoved(_PMessageBase):
+	name = consts.ConstMessage.PersistentRequestRemoved
 	_additional_params_ = {}
 	_param_types_ = {
-		'Global': types.FcpTypeBool,
+		'Global': types.TypeBool,
 		}
 
 
-class PluginInfo(MessageBase):
-	name = consts.Message.PluginInfo
+class MsgPluginInfo(_PMessageBase):
+	name = consts.ConstMessage.PluginInfo
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 		
 	
-class ProtocolError(MessageBase):
-	name = consts.Message.ProtocolError
+class MsgProtocolError(_PMessageBase):
+	name = consts.ConstMessage.ProtocolError
 	_additional_params_ = {}
 	_param_types_ = {
-		'Code': types.FcpTypeInt,
-		'Global': types.FcpTypeBool,
+		'Code': types.TypeInt,
+		'Global': types.TypeBool,
 		}
 	
 			
 	
-class PutFailed(MessageBase):
-	name = consts.Message.PutFailed
+class MsgPutFailed(_PMessageBase):
+	name = consts.ConstMessage.PutFailed
 	_additional_params_ = {}
 	_param_types_ = {
-		'Code': types.FcpTypeInt,
-		'ExpectedURI': key.FcpTypeKey,
-		'Global': types.FcpTypeBool,
+		'Code': types.TypeInt,
+		'ExpectedURI': key.TypeKey,
+		'Global': types.TypeBool,
 		}
 
 
-class PutFetchable(MessageBase):
-	name = consts.Message.PutFetchable
+class MsgPutFetchable(_PMessageBase):
+	name = consts.ConstMessage.PutFetchable
 	_additional_params_ = {}
 	_param_types_ = {
-		'Global': types.FcpTypeBool,
-		'URI': key.FcpTypeKey,
+		'Global': types.TypeBool,
+		'URI': key.TypeKey,
 		}
 
 #####################################
 ######################################
 #!! not implemented
 #TODO: has more params
-class PutSuccessful(MessageBase):
-	name = consts.Message.PutSuccessful
+class MsgPutSuccessful(_PMessageBase):
+	name = consts.ConstMessage.PutSuccessful
 	_additional_params_ = {}
 	_param_types_ = {
-		'Global': types.FcpTypeBool,
-		'URI': key.FcpTypeKey,
+		'Global': types.TypeBool,
+		'URI': key.TypeKey,
 		}
 
 
-class RemovePeer(MessageBase):
-	name = consts.Message.RemovePeer
+class MsgRemovePeer(_PMessageBase):
+	name = consts.ConstMessage.RemovePeer
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 		
 	
-class RemoveRequest(MessageBase):
-	name = consts.Message.RemoveRequest
+class MsgRemoveRequest(_PMessageBase):
+	name = consts.ConstMessage.RemoveRequest
 	_additional_params_ = {}
 	_param_types_ = {
-		'Global': types.FcpTypeBool,
+		'Global': types.TypeBool,
 		}
 
 
-class SSKKeypair(MessageBase):
-	name = consts.Message. SSKKeypair
+class MsgSSKKeypair(_PMessageBase):
+	name = consts.ConstMessage. SSKKeypair
 	_additional_params_ = {}
 	_param_types_ = {
-		'InsertURI': key.FcpTypeKey,
-		'RequestURI': key.FcpTypeKey,
+		'InsertURI': key.TypeKey,
+		'RequestURI': key.TypeKey,
 		}
 		
 
-class Shutdown(MessageBase):
-	name = consts.Message.Shutdown
+class MsgShutdown(_PMessageBase):
+	name = consts.ConstMessage.Shutdown
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 		
 
-class SimpleProgress(MessageBase):
-	name = consts.Message.SimpleProgress
+class MsgSimpleProgress(_PMessageBase):
+	name = consts.ConstMessage.SimpleProgress
 	_additional_params_ = {}
 	_param_types_ = {
-		'Failed': types.FcpTypeInt,
-		'FatalyFailed': types.FcpTypeInt,
-		'FinalizedTotal': types.FcpTypeBool,
-		'Required': types.FcpTypeInt,
-		'Succeeded': types.FcpTypeInt,
-		'Total': types.FcpTypeInt,
+		'Failed': types.TypeInt,
+		'FatalyFailed': types.TypeInt,
+		'FinalizedTotal': types.TypeBool,
+		'Required': types.TypeInt,
+		'Succeeded': types.TypeInt,
+		'Total': types.TypeInt,
 		}
 	
 
-class StartedCompression(MessageBase):
-	name = consts.Message.StartedCompression
+class MsgStartedCompression(_PMessageBase):
+	name = consts.ConstMessage.StartedCompression
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 		
 		
-class SubscribeUSK(MessageBase):
-	name = consts.Message.SubscribeUSK
-	_additional_params_ = AdditionalSubscribeUSKParams
+class MsgSubscribeUSK(_PMessageBase):
+	name = consts.ConstMessage.SubscribeUSK
+	_additional_params_ = _SubscribeUSKParams
 	_param_types_ = {
-		'DontPoll': types.FcpTypeBool,
-		'URI': key.FcpTypeKey,
+		'DontPoll': types.TypeBool,
+		'URI': key.TypeKey,
 		}
 
 
-class SubscribedUSKUpdate(MessageBase):
-	name = consts.Message.SubscribedUSKUpdate
+class MsgSubscribedUSKUpdate(_PMessageBase):
+	name = consts.ConstMessage.SubscribedUSKUpdate
 	_additional_params_ = {}
 	_param_types_ = {
-		'Edition': types.FcpTypeInt,
-		'URI': key.FcpTypeKey,
+		'Edition': types.TypeInt,
+		'URI': key.TypeKey,
 		}
 
 
-class TestDDAComplete(MessageBase):
-	name = consts.Message.TestDDAComplete
+class MsgTestDDAComplete(_PMessageBase):
+	name = consts.ConstMessage.TestDDAComplete
 	_additional_params_ = {}
 	_param_types_ = {
-		'ReadDirectoryAllowed': types.FcpTypeBool,
-		'WriteDirectoryAllowed': types.FcpTypeBool,
+		'ReadDirectoryAllowed': types.TypeBool,
+		'WriteDirectoryAllowed': types.TypeBool,
 		}
 
 
-class TestDDAReply(MessageBase):
-	name = consts.Message.TestDDAReply
+class MsgTestDDAReply(_PMessageBase):
+	name = consts.ConstMessage.TestDDAReply
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 
 
-class TestDDARequest(MessageBase):
-	name = consts.Message.TestDDARequest
+class MsgTestDDARequest(_PMessageBase):
+	name = consts.ConstMessage.TestDDARequest
 	_additional_params_ = {}
 	_param_types_ = {
-		'WantReadDirectory': types.FcpTypeBool,
-		'WantWriteDirectory': types.FcpTypeBool,
+		'WantReadDirectory': types.TypeBool,
+		'WantWriteDirectory': types.TypeBool,
 		}
 
 
-class TestDDAResponse(MessageBase):
-	name = consts.Message.TestDDAResponse
+class MsgTestDDAResponse(_PMessageBase):
+	name = consts.ConstMessage.TestDDAResponse
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 
 
-class URIGenerated(MessageBase):
-	name = consts.Message.URIGenerated
+class MsgURIGenerated(_PMessageBase):
+	name = consts.ConstMessage.URIGenerated
 	_additional_params_ = {}
 	_param_types_ = {
-		'URI': key.FcpTypeKey,
+		'URI': key.TypeKey,
 		}
 
 
-class UnknownNodeIdentifier(MessageBase):
-	name = consts.Message.UnknownNodeIdentifier
+class MsgUnknownNodeIdentifier(_PMessageBase):
+	name = consts.ConstMessage.UnknownNodeIdentifier
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 		
 	
-class UnknownPeerNoteType(MessageBase):
-	name = consts.Message.UnknownPeerNoteType
+class MsgUnknownPeerNoteType(_PMessageBase):
+	name = consts.ConstMessage.UnknownPeerNoteType
 	_additional_params_ = {}
 	_param_types_ = {
 		}
 		
 
-class WatchGlobal(MessageBase):
-	name = consts.Message.WatchGlobal
+class MsgWatchGlobal(_PMessageBase):
+	name = consts.ConstMessage.WatchGlobal
 	_additional_params_ = {}
 	_param_types_ = {
-		'Enabled': types.FcpTypeBool,
-		'VerbosityMask': types.FcpTypeInt,
+		'Enabled': types.TypeBool,
+		'VerbosityMask': types.TypeInt,
 		}
+
+
+__all__ = [i for i in dir() if i[0].isupper() and not i.startswith('_')]
+__all__.append('newMessageClass')
\ No newline at end of file


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