Merge branch 'feature/consistency' into develop

This commit is contained in:
Jason Watkins
2015-04-21 15:58:44 -07:00
51 changed files with 1812 additions and 2172 deletions

View File

@@ -52,9 +52,7 @@ namespace XPC
typedef struct
{
unsigned char id;
std::string ip;
unsigned short dstPort;
unsigned short srcPort;
sockaddr addr;
unsigned char getdCount;
std::string getdRequest[255];
} ConnectionInfo;