Skip to content

Y
ygopro
Commit 1c9bf733 authored by mercury233's avatar mercury233 Committed by GitHub
Browse files
Options

change NetServer::net_server_read to static (#2985)

parent 491c3501
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
gframe/netserver.cpp
View file @ 1c9bf733
...@@ -13,6 +13,7 @@ event* NetServer::broadcast_ev = 0; ...@@ -13,6 +13,7 @@ event* NetServer::broadcast_ev = 0;
evconnlistener* NetServer::listener = 0; evconnlistener* NetServer::listener = 0;
DuelMode* NetServer::duel_mode = 0; DuelMode* NetServer::duel_mode = 0;
unsigned char NetServer::net_server_write[SIZE_NETWORK_BUFFER]; unsigned char NetServer::net_server_write[SIZE_NETWORK_BUFFER];
unsigned char NetServer::net_server_read[SIZE_NETWORK_BUFFER];
size_t NetServer::last_sent = 0; size_t NetServer::last_sent = 0;
bool NetServer::StartServer(unsigned short port) { bool NetServer::StartServer(unsigned short port) {
...@@ -126,7 +127,6 @@ void NetServer::ServerEchoRead(bufferevent *bev, void *ctx) { ...@@ -126,7 +127,6 @@ void NetServer::ServerEchoRead(bufferevent *bev, void *ctx) {
int len = evbuffer_get_length(input); int len = evbuffer_get_length(input);
if (len < 2) if (len < 2)
return; return;
unsigned char* net_server_read = new unsigned char[SIZE_NETWORK_BUFFER];
uint16_t packet_len = 0; uint16_t packet_len = 0;
while (len >= 2) { while (len >= 2) {
evbuffer_copyout(input, &packet_len, sizeof packet_len); evbuffer_copyout(input, &packet_len, sizeof packet_len);
...@@ -137,7 +137,6 @@ void NetServer::ServerEchoRead(bufferevent *bev, void *ctx) { ...@@ -137,7 +137,6 @@ void NetServer::ServerEchoRead(bufferevent *bev, void *ctx) {
HandleCTOSPacket(&users[bev], &net_server_read[2], read_len - 2); HandleCTOSPacket(&users[bev], &net_server_read[2], read_len - 2);
len -= packet_len + 2; len -= packet_len + 2;
} }
delete[] net_server_read;
} }
void NetServer::ServerEchoEvent(bufferevent* bev, short events, void* ctx) { void NetServer::ServerEchoEvent(bufferevent* bev, short events, void* ctx) {
if (events & (BEV_EVENT_EOF | BEV_EVENT_ERROR)) { if (events & (BEV_EVENT_EOF | BEV_EVENT_ERROR)) {
......
gframe/netserver.h
View file @ 1c9bf733
...@@ -16,6 +16,7 @@ private: ...@@ -16,6 +16,7 @@ private:
static evconnlistener* listener; static evconnlistener* listener;
static DuelMode* duel_mode; static DuelMode* duel_mode;
static unsigned char net_server_write[SIZE_NETWORK_BUFFER]; static unsigned char net_server_write[SIZE_NETWORK_BUFFER];
static unsigned char net_server_read[SIZE_NETWORK_BUFFER];
static size_t last_sent; static size_t last_sent;
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment