diff --git a/libretroshare/src/rsitems/itempriorities.h b/libretroshare/src/rsitems/itempriorities.h index b7f29babc..8a464add4 100644 --- a/libretroshare/src/rsitems/itempriorities.h +++ b/libretroshare/src/rsitems/itempriorities.h @@ -25,28 +25,30 @@ // This file centralises QoS priorities for all transfer RsItems. // -const uint8_t QOS_PRIORITY_UNKNOWN = 0 ; -const uint8_t QOS_PRIORITY_DEFAULT = 3 ; -const uint8_t QOS_PRIORITY_TOP = 9 ; +const uint8_t QOS_PRIORITY_UNKNOWN = 0 ; +const uint8_t QOS_PRIORITY_DEFAULT = 3 ; +const uint8_t QOS_PRIORITY_TOP = 9 ; // Turtle traffic // -const uint8_t QOS_PRIORITY_RS_TURTLE_OPEN_TUNNEL = 6 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_TUNNEL_OK = 6 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_SEARCH_REQUEST = 6 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_FILE_REQUEST = 5 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_FILE_CRC_REQUEST = 5 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_CHUNK_CRC_REQUEST= 5 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_FILE_MAP_REQUEST = 5 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_SEARCH_RESULT = 3 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_FILE_DATA = 3 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_FILE_CRC = 3 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_CHUNK_CRC = 5 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_FILE_MAP = 3 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_GENERIC_ITEM = 3 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_FORWARD_FILE_DATA= 3 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_GENERIC_DATA = 5 ; -const uint8_t QOS_PRIORITY_RS_TURTLE_GENERIC_FAST_DATA= 7 ; +const uint8_t QOS_PRIORITY_RS_TURTLE_OPEN_TUNNEL = 7 ; +const uint8_t QOS_PRIORITY_RS_TURTLE_TUNNEL_OK = 7 ; +const uint8_t QOS_PRIORITY_RS_TURTLE_SEARCH_REQUEST = 7 ; + +const uint8_t QOS_PRIORITY_RS_TURTLE_FILE_REQUEST = 5 ; +const uint8_t QOS_PRIORITY_RS_TURTLE_FILE_CRC_REQUEST = 5 ; +const uint8_t QOS_PRIORITY_RS_TURTLE_CHUNK_CRC_REQUEST = 5 ; +const uint8_t QOS_PRIORITY_RS_TURTLE_FILE_MAP_REQUEST = 5 ; +const uint8_t QOS_PRIORITY_RS_TURTLE_FILE_DATA = 5 ; +const uint8_t QOS_PRIORITY_RS_TURTLE_FILE_CRC = 5 ; +const uint8_t QOS_PRIORITY_RS_TURTLE_CHUNK_CRC = 5 ; +const uint8_t QOS_PRIORITY_RS_TURTLE_FILE_MAP = 5 ; + +const uint8_t QOS_PRIORITY_RS_TURTLE_SEARCH_RESULT = 4 ; +const uint8_t QOS_PRIORITY_RS_TURTLE_GENERIC_ITEM = 3 ; +//const uint8_t QOS_PRIORITY_RS_TURTLE_FORWARD_FILE_DATA= 3 ; // unused +const uint8_t QOS_PRIORITY_RS_TURTLE_GENERIC_DATA = 5 ; +const uint8_t QOS_PRIORITY_RS_TURTLE_GENERIC_FAST_DATA = 7 ; // File transfer // @@ -54,24 +56,23 @@ const uint8_t QOS_PRIORITY_RS_FILE_REQUEST = 5 ; const uint8_t QOS_PRIORITY_RS_FILE_CRC_REQUEST = 5 ; const uint8_t QOS_PRIORITY_RS_CHUNK_CRC_REQUEST = 5 ; const uint8_t QOS_PRIORITY_RS_FILE_MAP_REQUEST = 5 ; -const uint8_t QOS_PRIORITY_RS_CACHE_REQUEST = 4 ; -const uint8_t QOS_PRIORITY_RS_FILE_DATA = 3 ; -const uint8_t QOS_PRIORITY_RS_FILE_CRC = 3 ; +const uint8_t QOS_PRIORITY_RS_FILE_DATA = 5 ; +const uint8_t QOS_PRIORITY_RS_FILE_CRC = 5 ; const uint8_t QOS_PRIORITY_RS_CHUNK_CRC = 5 ; -const uint8_t QOS_PRIORITY_RS_FILE_MAP = 3 ; -const uint8_t QOS_PRIORITY_RS_CACHE_ITEM = 3 ; +const uint8_t QOS_PRIORITY_RS_FILE_MAP = 5 ; +//const uint8_t QOS_PRIORITY_RS_CACHE_ITEM = 3 ; // unused // Discovery // const uint8_t QOS_PRIORITY_RS_DISC_HEART_BEAT = 8 ; const uint8_t QOS_PRIORITY_RS_DISC_ASK_INFO = 2 ; -const uint8_t QOS_PRIORITY_RS_DISC_REPLY = 1 ; -const uint8_t QOS_PRIORITY_RS_DISC_VERSION = 1 ; +const uint8_t QOS_PRIORITY_RS_DISC_REPLY = 2 ; +const uint8_t QOS_PRIORITY_RS_DISC_VERSION = 2 ; const uint8_t QOS_PRIORITY_RS_DISC_CONTACT = 2 ; // CONTACT and PGPLIST must have const uint8_t QOS_PRIORITY_RS_DISC_PGP_LIST = 2 ; // same priority. const uint8_t QOS_PRIORITY_RS_DISC_SERVICES = 2 ; -const uint8_t QOS_PRIORITY_RS_DISC_PGP_CERT = 1 ; +const uint8_t QOS_PRIORITY_RS_DISC_PGP_CERT = 2 ; // File database // @@ -92,11 +93,11 @@ const uint8_t QOS_PRIORITY_RS_STATUS_ITEM = 2 ; // RTT // -const uint8_t QOS_PRIORITY_RS_RTT_PING = 9 ; +const uint8_t QOS_PRIORITY_RS_RTT_PING = 9 ; // BanList // -const uint8_t QOS_PRIORITY_RS_BANLIST_ITEM = 2 ; +const uint8_t QOS_PRIORITY_RS_BANLIST_ITEM = 3 ; // Bandwidth Control. // @@ -109,10 +110,11 @@ const uint8_t QOS_PRIORITY_RS_DSDV_DATA = 2 ; // GXS // -const uint8_t QOS_PRIORITY_RS_GXS_NET = 3 ; +const uint8_t QOS_PRIORITY_RS_GXS_NET = 6 ; + // GXS Reputation. -const uint8_t QOS_PRIORITY_RS_GXSREPUTATION_ITEM = 2; +const uint8_t QOS_PRIORITY_RS_GXSREPUTATION_ITEM = 3; // Service Info / Control. -const uint8_t QOS_PRIORITY_RS_SERVICE_INFO_ITEM = 7; +const uint8_t QOS_PRIORITY_RS_SERVICE_INFO_ITEM = 8;