fix player disconnect

gframe/netserver.cpp

@@ -19,6 +19,7 @@ namespace{
 
 unsigned char NetServer::net_server_write[SIZE_NETWORK_BUFFER]{};
 size_t NetServer::last_sent{};
+bufferevent* NetServer::disconnecting_bev = nullptr;
 
 bool NetServer::StartServer(unsigned short port) {
 	if(net_evbase)
@@ -146,10 +147,13 @@ void NetServer::ServerEchoEvent(bufferevent* bev, short events, void* ctx) {
 	if (events & (BEV_EVENT_EOF | BEV_EVENT_ERROR)) {
 		DuelPlayer* dp = &users[bev];
 		DuelMode* dm = dp->game;
+		auto* prev_disconnect = disconnecting_bev;
+		disconnecting_bev = bev;
 		if(dm)
 			dm->LeaveGame(dp);
 		else
 			DisconnectPlayer(dp);
+		disconnecting_bev = prev_disconnect;
 	}
 }
 int NetServer::ServerThread() {
@@ -180,9 +184,14 @@ int NetServer::ServerThread() {
 void NetServer::DisconnectPlayer(DuelPlayer* dp) {
 	auto bit = users.find(dp->bev);
 	if(bit != users.end()) {
+		if(dp->game) {
+			dp->game->OnPlayerDisconnected(dp);
+			dp->game = nullptr;
+		}
 		bufferevent_flush(dp->bev, EV_WRITE, BEV_FLUSH);
 		bufferevent_disable(dp->bev, EV_READ);
 		bufferevent_free(dp->bev);
+		dp->bev = nullptr;
 		users.erase(bit);
 	}
 }

gframe/netserver.h

@@ -10,6 +10,11 @@ class NetServer {
 private:
 	static unsigned char net_server_write[SIZE_NETWORK_BUFFER];
 	static size_t last_sent;
+	static bufferevent* disconnecting_bev;
+
+	static bool CanWriteToPlayer(DuelPlayer* dp) {
+		return dp && dp->bev && dp->bev != disconnecting_bev;
+	}
 
 public:
 	static bool StartServer(unsigned short port);
@@ -42,7 +47,7 @@ class NetServer {
 		BufferIO::Write<uint16_t>(p, 1);
 		BufferIO::Write<uint8_t>(p, proto);
 		last_sent = 3;
-		if (dp)
+		if (CanWriteToPlayer(dp))
 			bufferevent_write(dp->bev, net_server_write, 3);
 	}
 	template<typename ST>
@@ -53,7 +58,7 @@ class NetServer {
 		BufferIO::Write<uint8_t>(p, proto);
 		std::memcpy(p, &st, sizeof(ST));
 		last_sent = sizeof(ST) + 3;
-		if (dp)
+		if (CanWriteToPlayer(dp))
 			bufferevent_write(dp->bev, net_server_write, sizeof(ST) + 3);
 	}
 	static void SendBufferToPlayer(DuelPlayer* dp, unsigned char proto, void* buffer, size_t len) {
@@ -64,11 +69,11 @@ class NetServer {
 		BufferIO::Write<uint8_t>(p, proto);
 		std::memcpy(p, buffer, len);
 		last_sent = len + 3;
-		if (dp)
+		if (CanWriteToPlayer(dp))
 			bufferevent_write(dp->bev, net_server_write, len + 3);
 	}
 	static void ReSendToPlayer(DuelPlayer* dp) {
-		if(dp)
+		if (CanWriteToPlayer(dp))
 			bufferevent_write(dp->bev, net_server_write, last_sent);
 	}
 };

gframe/network.h

@@ -224,6 +224,7 @@ class DuelMode {
 	virtual void GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) = 0;
 	virtual void TimeConfirm(DuelPlayer* dp) = 0;
 	virtual void EndDuel() = 0;
+	virtual void OnPlayerDisconnected(DuelPlayer* dp) = 0;
 
 public:
 	event* etimer { nullptr };

gframe/single_duel.cpp

@@ -172,6 +172,7 @@ void SingleDuel::LeaveGame(DuelPlayer* dp) {
 				wbuf[0] = MSG_WIN;
 				wbuf[1] = 1 - dp->type;
 				wbuf[2] = 0x4;
+				duel_stage = DUEL_STAGE_END;
 				NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, wbuf, 3);
 				NetServer::ReSendToPlayer(players[1]);
 				for(auto oit = observers.begin(); oit != observers.end(); ++oit)
@@ -1455,6 +1456,19 @@ void SingleDuel::EndDuel() {
 	event_del(etimer);
 	pduel = 0;
 }
+void SingleDuel::OnPlayerDisconnected(DuelPlayer* dp) {
+	if(host_player == dp)
+		host_player = nullptr;
+	for(int i = 0; i < 2; ++i) {
+		if(players[i] == dp) {
+			players[i] = nullptr;
+			ready[i] = false;
+		}
+		if(pplayer[i] == dp)
+			pplayer[i] = nullptr;
+	}
+	observers.erase(dp);
+}
 void SingleDuel::WaitforResponse(int playerid) {
 	last_response = playerid;
 	unsigned char msg = MSG_WAITING;

gframe/single_duel.h

@@ -29,6 +29,7 @@ class SingleDuel: public DuelMode {
 	void GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) override;
 	void TimeConfirm(DuelPlayer* dp) override;
 	void EndDuel() override;
+	void OnPlayerDisconnected(DuelPlayer* dp) override;
 
 	void DuelEndProc();
 	void WaitforResponse(int playerid);

gframe/tag_duel.cpp

@@ -1564,6 +1564,24 @@ void TagDuel::EndDuel() {
 	event_del(etimer);
 	pduel = 0;
 }
+void TagDuel::OnPlayerDisconnected(DuelPlayer* dp) {
+	if(host_player == dp)
+		host_player = nullptr;
+	for(int i = 0; i < 4; ++i) {
+		if(players[i] == dp) {
+			players[i] = nullptr;
+			ready[i] = false;
+			surrender[i] = false;
+		}
+		if(pplayer[i] == dp)
+			pplayer[i] = nullptr;
+	}
+	for(int i = 0; i < 2; ++i) {
+		if(cur_player[i] == dp)
+			cur_player[i] = nullptr;
+	}
+	observers.erase(dp);
+}
 void TagDuel::WaitforResponse(int playerid) {
 	last_response = playerid;
 	unsigned char msg = MSG_WAITING;

gframe/tag_duel.h

@@ -29,6 +29,7 @@ class TagDuel: public DuelMode {
 	void GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) override;
 	void TimeConfirm(DuelPlayer* dp) override;
 	void EndDuel() override;
+	void OnPlayerDisconnected(DuelPlayer* dp) override;
 
 	void DuelEndProc();
 	void WaitforResponse(int playerid);