Skip to content

Commit

Permalink
Removed svn keyword tags from most files.
Browse files Browse the repository at this point in the history
  • Loading branch information
nemerle committed Feb 14, 2013
1 parent 60dcd62 commit 1355d34
Show file tree
Hide file tree
Showing 157 changed files with 757 additions and 922 deletions.
2 changes: 0 additions & 2 deletions Components/Client/Utilities/GUI_Related/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# $Id$

#ADD_SUBDIRECTORY(OgrePanel)
#ADD_SUBDIRECTORY(OgreDShow)
#ADD_SUBDIRECTORY(Goblin)
3 changes: 1 addition & 2 deletions Components/Common/Bitstream/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $Id$
SET(target_CPP
${CMAKE_CURRENT_SOURCE_DIR}/src/BitStream.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/BitStream.cpp
)
SET(target_INCLUDE
${CMAKE_CURRENT_SOURCE_DIR}/include/BitStream.h
Expand Down
1 change: 0 additions & 1 deletion Components/Common/Bitstream/include/BitStream.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Copyright (c) 2006 Super Entity Game Server Team (see Authors.txt)
* This software is licensed! (See License.txt for details)
*
* $Id$
*/

/************************************************************************
Expand Down
1 change: 0 additions & 1 deletion Components/Common/Bitstream/src/BitStream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Copyright (c) 2006 Super Entity Game Server Team (see Authors.txt)
* This software is licensed! (See License.txt for details)
*
* $Id$
*/
#include <cstring>
#include <cassert>
Expand Down
5 changes: 2 additions & 3 deletions Components/Common/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# $Id$
ADD_SUBDIRECTORY(Globals) # includes each project should really have version numbers, types etc.
ADD_SUBDIRECTORY(ConfigExtensions) # contains extensions to ACE's config file processing
ADD_SUBDIRECTORY(EventSystem)
ADD_SUBDIRECTORY(GrowingBuffer)
ADD_SUBDIRECTORY(EventSystem)
ADD_SUBDIRECTORY(GrowingBuffer)
ADD_SUBDIRECTORY(Bitstream)
ADD_SUBDIRECTORY(CRUDP_Protocol)

1 change: 0 additions & 1 deletion Components/Common/CRUDP_Protocol/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# $Id$
SET(target_CPP
${CMAKE_CURRENT_SOURCE_DIR}/src/CRUDP_Packet.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/CRUDP_Protocol.cpp
Expand Down
125 changes: 62 additions & 63 deletions Components/Common/CRUDP_Protocol/include/CRUDP_Packet.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Copyright (c) 2006 Super Entity Game Server Team (see Authors.txt)
* This software is licensed! (See License.txt for details)
*
* $Id$
*/

#pragma once
Expand All @@ -21,77 +20,77 @@ static const uint32_t packetHeaderSize = 8;
class CrudP_Packet
{
public:
friend class PacketCollector;
friend class PacketCollector;

CrudP_Packet();
explicit CrudP_Packet(const CrudP_Packet &);
CrudP_Packet(BitStream *stream, bool hasDebugInfo);
~CrudP_Packet();
CrudP_Packet();
explicit CrudP_Packet(const CrudP_Packet &);
CrudP_Packet(BitStream *stream, bool hasDebugInfo);
~CrudP_Packet();

uint32_t GetBits(uint32_t nBits);
void GetBitArray(uint32_t nBytes, uint8_t *array);
uint32_t GetPackedBits(uint32_t nBits);
void GetString(std::string &str);
uint32_t GetBits(uint32_t nBits);
void GetBitArray(uint32_t nBytes, uint8_t *array);
uint32_t GetPackedBits(uint32_t nBits);
void GetString(std::string &str);

float GetFloat();
void StoreBits(uint32_t nBits, uint32_t dataBits) { m_stream->StoreBits(nBits, dataBits); };
void StoreBitArray(uint8_t *array, size_t nBits) { m_stream->StoreBitArray(array,nBits); };
void StorePackedBits(uint32_t nBits, uint32_t dataBits) { m_stream->StorePackedBits(nBits, dataBits); };
void StoreString(const char *str) { m_stream->StoreString(str); };
void CompressAndStoreString(const char *str);
float GetFloat();
void StoreBits(uint32_t nBits, uint32_t dataBits) { m_stream->StoreBits(nBits, dataBits); };
void StoreBitArray(uint8_t *array, size_t nBits) { m_stream->StoreBitArray(array,nBits); };
void StorePackedBits(uint32_t nBits, uint32_t dataBits) { m_stream->StorePackedBits(nBits, dataBits); };
void StoreString(const char *str) { m_stream->StoreString(str); };
void CompressAndStoreString(const char *str);

// Sets the packet to the "finalized" state.
// This means that it's header is built, acks
// are stored in it, etc..
void SetFinalized() { m_finalized = true; };
// Sets the packet to the "finalized" state.
// This means that it's header is built, acks
// are stored in it, etc..
void SetFinalized() { m_finalized = true; };

// Accessors
//////////////////////////////////////////////////////////////////////////
uint8_t * GetBuffer() const { return (uint8_t *)m_stream->GetBuffer(); };
size_t GetPacketLength() const { return m_stream->GetReadableDataSize();};
BitStream * GetStream() { return m_stream; };
bool HasDebugInfo() const { return m_hasDebugInfo; };
bool getIsCompressed() const { return m_compressed; };
bool HasSiblings() const { return (m_numSibs > 0); };
bool IsFinalized() const { return m_finalized; };
// Accessors
//////////////////////////////////////////////////////////////////////////
uint8_t * GetBuffer() const { return (uint8_t *)m_stream->GetBuffer(); };
size_t GetPacketLength() const { return m_stream->GetReadableDataSize();};
BitStream * GetStream() { return m_stream; };
bool HasDebugInfo() const { return m_hasDebugInfo; };
bool getIsCompressed() const { return m_compressed; };
bool HasSiblings() const { return (m_numSibs > 0); };
bool IsFinalized() const { return m_finalized; };

uint32_t GetPackedBitsLength(uint32_t len, uint32_t dataBits) { return m_stream->GetPackedBitsLength(len, dataBits); };
void SetBufferLength(uint32_t length) { m_stream->SetByteLength(length); };
uint32_t GetPackedBitsLength(uint32_t len, uint32_t dataBits) { return m_stream->GetPackedBitsLength(len, dataBits); };
void SetBufferLength(uint32_t length) { m_stream->SetByteLength(length); };

uint32_t GetSequenceNumber() const { return m_seqNo; };
uint32_t GetSiblingPosition() const { return m_sibPos; };
uint32_t getNumSibs() const { return m_numSibs;}
uint32_t getSibId() const { return m_sibId;}
uint32_t getSibPos() const { return m_sibPos;}
void setContents(const BitStream &t);
void ByteAlign() { m_stream->ByteAlign(); };
void SetStream(BitStream *stream) { m_stream = stream; };
void SetHasDebugInfo(bool hasDebugInfo) { m_hasDebugInfo = hasDebugInfo; };
void SetIsCompressed(bool compressed) { m_compressed = compressed; };
void setSeqNo(uint32_t n) {m_seqNo=n;}
void setNumSibs(uint32_t n) {m_numSibs=n;}
void setSibId(uint32_t n) {m_sibId=n;}
void setSibPos(uint32_t n) {m_sibPos=n;}
void addAck(uint32_t id)
{
m_acks.insert(id);
}
uint32_t getNextAck();
size_t getNumAcks()
{
return m_acks.size();
}
void dump();
uint32_t m_checksum;
uint32_t GetSequenceNumber() const { return m_seqNo; };
uint32_t GetSiblingPosition() const { return m_sibPos; };
uint32_t getNumSibs() const { return m_numSibs;}
uint32_t getSibId() const { return m_sibId;}
uint32_t getSibPos() const { return m_sibPos;}
void setContents(const BitStream &t);
void ByteAlign() { m_stream->ByteAlign(); };
void SetStream(BitStream *stream) { m_stream = stream; };
void SetHasDebugInfo(bool hasDebugInfo) { m_hasDebugInfo = hasDebugInfo; };
void SetIsCompressed(bool compressed) { m_compressed = compressed; };
void setSeqNo(uint32_t n) {m_seqNo=n;}
void setNumSibs(uint32_t n) {m_numSibs=n;}
void setSibId(uint32_t n) {m_sibId=n;}
void setSibPos(uint32_t n) {m_sibPos=n;}
void addAck(uint32_t id)
{
m_acks.insert(id);
}
uint32_t getNextAck();
size_t getNumAcks()
{
return m_acks.size();
}
void dump();
uint32_t m_checksum;
protected:

BitStream *m_stream;
bool m_hasDebugInfo, m_compressed, m_finalized;
uint32_t m_seqNo;
uint32_t m_numSibs;
uint32_t m_sibId;
uint32_t m_sibPos;
std::set<uint32_t> m_acks;
BitStream *m_stream;
bool m_hasDebugInfo, m_compressed, m_finalized;
uint32_t m_seqNo;
uint32_t m_numSibs;
uint32_t m_sibId;
uint32_t m_sibPos;
std::set<uint32_t> m_acks;
};
typedef std::list<CrudP_Packet *> lCrudP_Packet;
typedef std::vector<CrudP_Packet *> vCrudP_Packet;
Expand Down
1 change: 0 additions & 1 deletion Components/Common/CRUDP_Protocol/include/CRUDP_Protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Copyright (c) 2006 Super Entity Game Server Team (see Authors.txt)
* This software is licensed! (See License.txt for details)
*
* $Id$
*/

#pragma once
Expand Down
11 changes: 5 additions & 6 deletions Components/Common/CRUDP_Protocol/include/PacketCodec.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Copyright (c) 2006 Super Entity Game Server Team (see Authors.txt)
* This software is licensed! (See License.txt for details)
*
* $Id$
*/

/************************************************************************
Expand All @@ -31,12 +30,12 @@ using namespace CryptoPP;
#endif
#include "Base.h"

class PacketCodecNull
class PacketCodecNull
{
public:
static uint32_t Checksum(const uint8_t *buf,size_t size);
void Decrypt(uint8_t * /*arr*/,size_t /*size*/){};
void Encrypt(uint8_t * /*arr*/,size_t /*size*/){};
void StartEncryption(uint8_t * /*other_public_key*/){};
static uint32_t Checksum(const uint8_t *buf,size_t size);
void Decrypt(uint8_t * /*arr*/,size_t /*size*/){};
void Encrypt(uint8_t * /*arr*/,size_t /*size*/){};
void StartEncryption(uint8_t * /*other_public_key*/){};

};
1 change: 0 additions & 1 deletion Components/Common/CRUDP_Protocol/src/CRUDP_Packet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Copyright (c) 2006 Super Entity Game Server Team (see Authors.txt)
* This software is licensed! (See License.txt for details)
*
* $Id$
*/

#include "Base.h"
Expand Down
1 change: 0 additions & 1 deletion Components/Common/CRUDP_Protocol/src/PacketCodec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Copyright (c) 2006 Super Entity Game Server Team (see Authors.txt)
* This software is licensed! (See License.txt for details)
*
* $Id$
*/

#include "PacketCodec.h"
Expand Down
1 change: 0 additions & 1 deletion Components/Common/ConfigExtensions/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# $Id$
SET(target_CPP
)
SET(target_INCLUDE
Expand Down
79 changes: 39 additions & 40 deletions Components/Common/ConfigExtensions/include/ConfigExtension.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Copyright (c) 2006 Super Entity Game Server Team (see Authors.txt)
* This software is licensed! (See License.txt for details)
*
* $Id$
*/

#pragma once
Expand All @@ -16,43 +15,43 @@
class StringsBasedCfg : public ACE_Configuration_Heap
{
public:
int get_integer_value(const ACE_Configuration_Section_Key& key,const ACE_TCHAR* name,uint16_t& value,uint16_t default_val)
{
ACE_TString res;
if(-1==ACE_Configuration_Heap::get_string_value(key,name,res))
{
value=default_val;
return -1;
}
value = (uint16_t)strtoul(res.c_str(),0,0);
return 0;
}
int get_string_value(const ACE_Configuration_Section_Key& key, const ACE_TCHAR* name, std::string& value,const std::string &default_val)
{
ACE_TString res;
if(-1==ACE_Configuration_Heap::get_string_value(key,name,res))
{
value=default_val;
return -1;
}
value=res.c_str();
return 0;
}
int get_addr(const ACE_Configuration_Section_Key& key, const ACE_TCHAR* name, ACE_INET_Addr& value,const ACE_INET_Addr &default_val)
{
ACE_TString res;
if(-1==ACE_Configuration_Heap::get_string_value(key,name,res))
{
value.set(default_val);
return -1;
}
ACE_TString::size_type pos = res.rfind(':');
if(ACE_TString::npos==pos) // invalid addr
{
value=default_val;
return -1;
}
value.set((uint16_t)strtoul(res.substr(pos+1,ACE_TString::npos).c_str(),0,0),res.substr(0,pos).c_str());
return 0;
}
int get_integer_value(const ACE_Configuration_Section_Key& key,const ACE_TCHAR* name,uint16_t& value,uint16_t default_val)
{
ACE_TString res;
if(-1==ACE_Configuration_Heap::get_string_value(key,name,res))
{
value=default_val;
return -1;
}
value = (uint16_t)strtoul(res.c_str(),0,0);
return 0;
}
int get_string_value(const ACE_Configuration_Section_Key& key, const ACE_TCHAR* name, std::string& value,const std::string &default_val)
{
ACE_TString res;
if(-1==ACE_Configuration_Heap::get_string_value(key,name,res))
{
value=default_val;
return -1;
}
value=res.c_str();
return 0;
}
int get_addr(const ACE_Configuration_Section_Key& key, const ACE_TCHAR* name, ACE_INET_Addr& value,const ACE_INET_Addr &default_val)
{
ACE_TString res;
if(-1==ACE_Configuration_Heap::get_string_value(key,name,res))
{
value.set(default_val);
return -1;
}
ACE_TString::size_type pos = res.rfind(':');
if(ACE_TString::npos==pos) // invalid addr
{
value=default_val;
return -1;
}
value.set((uint16_t)strtoul(res.substr(pos+1,ACE_TString::npos).c_str(),0,0),res.substr(0,pos).c_str());
return 0;
}
};
1 change: 0 additions & 1 deletion Components/Common/EventSystem/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# $Id$
SET(target_CPP
${CMAKE_CURRENT_SOURCE_DIR}/src/EventProcessor.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/SEGSTimer.cpp
Expand Down
1 change: 0 additions & 1 deletion Components/Common/Globals/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# $Id$
SET(target_CPP
)
SET(target_INCLUDE
Expand Down
1 change: 0 additions & 1 deletion Components/Common/Globals/include/Base.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Copyright (c) 2006 Super Entity Game Server Team (see Authors.txt)
* This software is licensed! (See License.txt for details)
*
* $Id$
*/

// Base.h - This file defines all of the global includes
Expand Down
30 changes: 0 additions & 30 deletions Components/Common/Globals/include/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Copyright (c) 2006 Super Entity Game Server Team (see Authors.txt)
* This software is licensed! (See License.txt for details)
*
* $Id$
*/

// types.h
Expand All @@ -13,32 +12,3 @@
// *believe* credit for these goes to CatId...but i'm not sure.
#pragma once
#include <stdint.h>
//////// Typedefs
// The custom types below are now deprecated by stdint.h -ldilley
/*
#ifdef WIN32
typedef unsigned __int8 u8;
typedef unsigned __int16 u16;
typedef unsigned __int32 u32;
typedef unsigned __int64 uint64_t;
typedef signed __int8 s8;
typedef signed __int16 s16;
typedef signed __int32 s32;
typedef signed __int64 int64_t;
#else // For UNIX/Linux -ldilley
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
typedef unsigned long long uint64_t;
typedef signed char s8;
typedef signed short int16_t;
typedef signed int int32_t;
typedef signed long long int64_t;
#endif
*/

/*
typedef float f32;
typedef double f64;
*/
Loading

0 comments on commit 1355d34

Please sign in to comment.