sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Went over netpacket.cpp - additional checks, check function in base class. More restrictive concerning size of packets.

Browse Source
This commit is contained in:
lotodore
2007-07-29 23:45:10 +00:00
parent 212dbd3b9a
commit 5d13dd7803
5 changed files with 233 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game_defs.h
+4
View File
@@ -20,8 +20,12 @@
#ifndef GAME_DEFS_H #ifndef GAME_DEFS_H
#define GAME_DEFS_H #define GAME_DEFS_H
#define MIN_NUMBER_OF_PLAYERS 2
#define MAX_NUMBER_OF_PLAYERS 7 #define MAX_NUMBER_OF_PLAYERS 7
#define MIN_GUI_SPEED 1
#define MAX_GUI_SPEED 11
enum GameState { enum GameState {
GAME_STATE_PREFLOP = 0, GAME_STATE_PREFLOP = 0,
GAME_STATE_FLOP, GAME_STATE_FLOP,
src/net/common/netpacket.cpp
+202 -243
View File
File diff suppressed because it is too large Load Diff
src/net/common/receiverhelper.cpp
+1
View File
@@ -109,6 +109,7 @@ ReceiverHelper::InternalGetPacket()
{ {
// Reset buffer on error. // Reset buffer on error.
m_tmpInBufSize = 0; m_tmpInBufSize = 0;
// TODO: log error/increase error counter.
} }
} }
return tmpPacket; return tmpPacket;
src/net/netpacket.h
+25 -22
View File
@@ -66,7 +66,7 @@ class NetPacket
public: public:
static boost::shared_ptr<NetPacket> Create(char *data, unsigned &dataSize); static boost::shared_ptr<NetPacket> Create(char *data, unsigned &dataSize);
NetPacket(u_int16_t type, u_int16_t initialLen); NetPacket(u_int16_t type, u_int16_t initialSize, u_int16_t maxSize);
virtual ~NetPacket(); virtual ~NetPacket();
virtual boost::shared_ptr<NetPacket> Clone() const = 0; virtual boost::shared_ptr<NetPacket> Clone() const = 0;
@@ -101,13 +101,16 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const = 0; void Check(const NetPacketHeader *data) const;
virtual void InternalCheck(const NetPacketHeader *data) const = 0;
void Resize(u_int16_t newLen); void Resize(u_int16_t newLen);
private: private:
NetPacketHeader *m_data; NetPacketHeader *m_data;
const u_int16_t m_initialSize;
const u_int16_t m_maxSize;
}; };
class NetPacketJoinGame : public NetPacket class NetPacketJoinGame : public NetPacket
@@ -134,7 +137,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketJoinGameAck : public NetPacket class NetPacketJoinGameAck : public NetPacket
@@ -159,7 +162,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketPlayerJoined : public NetPacket class NetPacketPlayerJoined : public NetPacket
@@ -184,7 +187,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketPlayerLeft : public NetPacket class NetPacketPlayerLeft : public NetPacket
@@ -207,7 +210,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketGameStart : public NetPacket class NetPacketGameStart : public NetPacket
@@ -239,7 +242,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketHandStart : public NetPacket class NetPacketHandStart : public NetPacket
@@ -262,7 +265,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketPlayersTurn : public NetPacket class NetPacketPlayersTurn : public NetPacket
@@ -286,7 +289,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketPlayersAction : public NetPacket class NetPacketPlayersAction : public NetPacket
@@ -311,7 +314,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketPlayersActionDone : public NetPacket class NetPacketPlayersActionDone : public NetPacket
@@ -338,7 +341,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketPlayersActionRejected : public NetPacket class NetPacketPlayersActionRejected : public NetPacket
@@ -365,7 +368,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketDealFlopCards : public NetPacket class NetPacketDealFlopCards : public NetPacket
@@ -388,7 +391,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketDealTurnCard : public NetPacket class NetPacketDealTurnCard : public NetPacket
@@ -411,7 +414,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketDealRiverCard : public NetPacket class NetPacketDealRiverCard : public NetPacket
@@ -434,7 +437,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketAllInShowCards : public NetPacket class NetPacketAllInShowCards : public NetPacket
@@ -465,7 +468,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketEndOfHandShowCards : public NetPacket class NetPacketEndOfHandShowCards : public NetPacket
@@ -500,7 +503,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketEndOfHandHideCards : public NetPacket class NetPacketEndOfHandHideCards : public NetPacket
@@ -525,7 +528,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketEndOfGame : public NetPacket class NetPacketEndOfGame : public NetPacket
@@ -548,7 +551,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketSendChatText : public NetPacket class NetPacketSendChatText : public NetPacket
@@ -571,7 +574,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketChatText : public NetPacket class NetPacketChatText : public NetPacket
@@ -595,7 +598,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
class NetPacketError : public NetPacket class NetPacketError : public NetPacket
@@ -618,7 +621,7 @@ public:
protected: protected:
virtual void Check(const NetPacketHeader* data) const; virtual void InternalCheck(const NetPacketHeader* data) const;
}; };
#endif #endif
src/net/socket_msg.h
+1
View File
@@ -40,6 +40,7 @@
#define ERR_SOCK_CONN_EXISTS 17 #define ERR_SOCK_CONN_EXISTS 17
#define ERR_SOCK_INVALID_PACKET 18 #define ERR_SOCK_INVALID_PACKET 18
#define ERR_SOCK_INVALID_STATE 19 #define ERR_SOCK_INVALID_STATE 19
#define ERR_SOCK_INVALID_TYPE 20
// The following errors are game errors. // The following errors are game errors.
#define ERR_NET_VERSION_NOT_SUPPORTED 101 #define ERR_NET_VERSION_NOT_SUPPORTED 101
#define ERR_NET_SERVER_FULL 102 #define ERR_NET_SERVER_FULL 102