Merge branch 'master' into server

.gitlab-ci.yml

@@ -47,6 +47,7 @@ mat_linux:
   stage: prepare
   tags:
     - linux
+  image: git-registry.myard.moe/mycard/docker-runner-base:debian11
   script:
     - apt update; apt -y install git wget tar
     - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
@@ -109,6 +110,7 @@ exec_linux:
   extends: ._exec_build
   tags:
     - linux
+  image: git-registry.myard.moe/mycard/docker-runner-base:debian11
   dependencies:
     - mat_common
     - mat_linux

gframe/bufferio.h

@@ -163,6 +163,10 @@ public:
 	static int DecodeUTF8(const char* src, wchar_t(&dst)[N]) {
 		return DecodeUTF8String(src, dst, N);
 	}
+	template<size_t N, typename T>
+	static void NullTerminate(T(&str)[N]) {
+		str[N - 1] = 0;
+	}
 	static int GetVal(const wchar_t* pstr) {
 		unsigned int ret = 0;
 		while(*pstr >= L'0' && *pstr <= L'9') {

gframe/config.h

@@ -31,7 +31,6 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
-#include <locale.h>
 
 #define SD_BOTH 2
 #define SOCKET int

gframe/deck_con.cpp

@@ -1803,7 +1803,7 @@ bool DeckBuilder::push_main(code_pointer pointer, int seq) {
 	if(pointer->second.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK))
 		return false;
 	auto& container = deckManager.current_deck.main;
-	int maxc = mainGame->is_siding ? DECK_MAX_SIZE + 4 : DECK_MAX_SIZE;
+	int maxc = mainGame->is_siding ? DECK_MAX_SIZE + 5 : DECK_MAX_SIZE;
 	if((int)container.size() >= maxc)
 		return false;
 	if(seq >= 0 && seq < (int)container.size())

gframe/deck_manager.cpp

@@ -181,7 +181,7 @@ int DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_p
 		}
 		if(cd.type & TYPE_TOKEN)
 			continue;
-		if(deck.side.size() < YGOPRO_MAX_SIDE)
+		if(deck.side.size() < SIDE_MAX_SIZE)
 			deck.side.push_back(dataManager.GetCodePointer(code));
 	}
 	return errorcode;
@@ -255,6 +255,8 @@ bool DeckManager::LoadDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUICom
 	bool res = LoadDeck(filepath, is_packlist);
 	if(res && mainGame->is_building)
 		mainGame->deckBuilder.RefreshPackListScroll();
+	if (!res)
+		current_deck.clear();
 	return res;
 }
 FILE* DeckManager::OpenDeckFile(const wchar_t* file, const char* mode) {
@@ -293,8 +295,8 @@ bool DeckManager::LoadDeck(const wchar_t* file, bool is_packlist) {
 	}
 	if(!reader)
 		return false;
-	size_t size = reader->getSize();
-	if(size >= 0x20000) {
+	auto size = reader->getSize();
+	if(size >= (int)sizeof deckBuffer) {
 		reader->drop();
 		return false;
 	}
@@ -309,7 +311,7 @@ bool DeckManager::LoadDeck(std::istringstream* deckStream, bool is_packlist) {
 	int cardlist[300];
 	bool is_side = false;
 	std::string linebuf;
-	while(std::getline(*deckStream, linebuf) && ct < 300) {
+	while(std::getline(*deckStream, linebuf, '\n') && ct < 300) {
 		if(linebuf[0] == '!') {
 			is_side = true;
 			continue;

gframe/duelclient.cpp

@@ -22,8 +22,6 @@ unsigned char DuelClient::selftype = 0;
 bool DuelClient::is_host = false;
 event_base* DuelClient::client_base = 0;
 bufferevent* DuelClient::client_bev = 0;
-unsigned char DuelClient::duel_client_read[SIZE_NETWORK_BUFFER];
-int DuelClient::read_len = 0;
 unsigned char DuelClient::duel_client_write[SIZE_NETWORK_BUFFER];
 bool DuelClient::is_closing = false;
 bool DuelClient::is_swapping = false;
@@ -59,6 +57,7 @@ bool DuelClient::StartClient(unsigned int ip, unsigned short port, bool create_g
 	sin.sin_addr.s_addr = htonl(ip);
 	sin.sin_port = htons(port);
 	client_bev = bufferevent_socket_new(client_base, -1, BEV_OPT_CLOSE_ON_FREE);
+	bufferevent_setwatermark(client_bev, EV_READ, 3, 0);
 	bufferevent_setcb(client_bev, ClientRead, NULL, ClientEvent, (void*)create_game);
 	temp_ip = ip;
 	temp_port = port;
@@ -113,24 +112,23 @@ void DuelClient::StopClient(bool is_exiting) {
 void DuelClient::ClientRead(bufferevent* bev, void* ctx) {
 	evbuffer* input = bufferevent_get_input(bev);
 	int len = evbuffer_get_length(input);
-	unsigned short packet_len = 0;
-	while(true) {
-		if(len < 2)
-			return;
-		evbuffer_copyout(input, &packet_len, 2);
+	unsigned char* duel_client_read = new unsigned char[std::min(len, SIZE_NETWORK_BUFFER)];
+	unsigned short packet_len;
+	while (len >= 2) {
+		evbuffer_copyout(input, &packet_len, sizeof packet_len);
 		if (packet_len + 2 > SIZE_NETWORK_BUFFER) {
+			delete[] duel_client_read;
 			ClientEvent(bev, BEV_EVENT_ERROR, 0);
 			return;
 		}
-		if(len < packet_len + 2)
-			return;
-		if (packet_len < 1)
-			return;
-		read_len = evbuffer_remove(input, duel_client_read, packet_len + 2);
+		if (len < packet_len + 2)
+			break;
+		int read_len = evbuffer_remove(input, duel_client_read, packet_len + 2);
 		if (read_len >= 3)
 			HandleSTOCPacketLan(&duel_client_read[2], read_len - 2);
 		len -= packet_len + 2;
 	}
+	delete[] duel_client_read;
 }
 void DuelClient::ClientEvent(bufferevent *bev, short events, void *ctx) {
 	if (events & BEV_EVENT_CONNECTED) {
@@ -940,10 +938,11 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, int len) {
 		soundManager.PlaySoundEffect(SOUND_PLAYER_ENTER);
 		STOC_HS_PlayerEnter packet;
 		std::memcpy(&packet, pdata, STOC_HS_PlayerEnter_size);
-		const auto* pkt = &packet;
+		auto pkt = &packet;
 		if(pkt->pos > 3)
 			break;
 		wchar_t name[20];
+		BufferIO::NullTerminate(pkt->name);
 		BufferIO::CopyWStr(pkt->name, name, 20);
 		if(mainGame->dInfo.isTag) {
 			if(pkt->pos == 0)
@@ -1686,7 +1685,7 @@ int DuelClient::ClientAnalyze(unsigned char* msg, unsigned int len) {
 			wchar_t ynbuf[256];
 			myswprintf(ynbuf, dataManager.GetSysString(221), dataManager.FormatLocation(l, s), dataManager.GetName(code));
 			myswprintf(textBuffer, L"%ls\n%ls\n%ls", event_string, ynbuf, dataManager.GetSysString(223));
-		} else if(desc < 2048) {
+		} else if(desc <= MAX_STRING_ID) {
 			myswprintf(textBuffer, dataManager.GetSysString(desc), dataManager.GetName(code));
 		} else {
 			myswprintf(textBuffer, dataManager.GetDesc(desc), dataManager.GetName(code));

gframe/duelclient.h

@@ -60,8 +60,6 @@ private:
 	static bool is_host;
 	static event_base* client_base;
 	static bufferevent* client_bev;
-	static unsigned char duel_client_read[SIZE_NETWORK_BUFFER];
-	static int read_len;
 	static unsigned char duel_client_write[SIZE_NETWORK_BUFFER];
 	static bool is_closing;
 	static bool is_swapping;
@@ -106,16 +104,15 @@ public:
 	template<typename ST>
 	static void SendPacketToServer(unsigned char proto, ST& st) {
 		auto p = duel_client_write;
-		int blen = sizeof(ST);
-		if (blen > MAX_DATA_SIZE)
+		if ((int)sizeof(ST) > MAX_DATA_SIZE)
 			return;
-		BufferIO::WriteInt16(p, (short)(1 + blen));
+		BufferIO::WriteInt16(p, (short)(1 + sizeof(ST)));
 		BufferIO::WriteInt8(p, proto);
-		std::memcpy(p, &st, blen);
+		std::memcpy(p, &st, sizeof(ST));
 #ifdef YGOPRO_MESSAGE_DEBUG
 		printf("CTOS: %d Length: %ld\n", proto, sizeof(ST));
 #endif
-		bufferevent_write(client_bev, duel_client_write, blen + 3);
+		bufferevent_write(client_bev, duel_client_write, sizeof(ST) + 3);
 	}
 	static void SendBufferToServer(unsigned char proto, void* buffer, size_t len) {
 		auto p = duel_client_write;

gframe/game.h

@@ -312,6 +312,7 @@ public:
 	HWND hWnd;
 #endif
 
+	std::vector<irr::gui::IGUIEditBox* > editbox_list;
 	//GUI
 	irr::gui::IGUIEnvironment* env;
 	irr::gui::CGUITTFont* guiFont;

gframe/gframe.cpp

@@ -2,6 +2,7 @@
 #include "game.h"
 #include "data_manager.h"
 #include <event2/thread.h>
+#include <locale.h>
 #include <memory>
 #ifdef __APPLE__
 #import <CoreFoundation/CoreFoundation.h>

gframe/netserver.cpp

@@ -9,8 +9,6 @@ event_base* NetServer::net_evbase = 0;
 event* NetServer::broadcast_ev = 0;
 evconnlistener* NetServer::listener = 0;
 DuelMode* NetServer::duel_mode = 0;
-unsigned char NetServer::net_server_read[SIZE_NETWORK_BUFFER];
-int NetServer::read_len = 0;
 unsigned char NetServer::net_server_write[SIZE_NETWORK_BUFFER];
 unsigned short NetServer::last_sent = 0;
 
@@ -196,6 +194,7 @@ void NetServer::ServerAccept(evconnlistener* listener, evutil_socket_t fd, socka
 	dp.type = 0xff;
 	dp.bev = bev;
 	users[bev] = dp;
+	bufferevent_setwatermark(bev, EV_READ, 3, 0);
 	bufferevent_setcb(bev, ServerEchoRead, NULL, ServerEchoEvent, NULL);
 	bufferevent_enable(bev, EV_READ);
 }
@@ -210,24 +209,23 @@ void NetServer::ServerAcceptError(evconnlistener* listener, void* ctx) {
 void NetServer::ServerEchoRead(bufferevent *bev, void *ctx) {
 	evbuffer* input = bufferevent_get_input(bev);
 	int len = evbuffer_get_length(input);
-	unsigned short packet_len = 0;
-	while(true) {
-		if(len < 2)
-			return;
-		evbuffer_copyout(input, &packet_len, 2);
+	unsigned char* net_server_read = new unsigned char[std::min(len, SIZE_NETWORK_BUFFER)];
+	unsigned short packet_len;
+	while (len >= 2) {
+		evbuffer_copyout(input, &packet_len, sizeof packet_len);
 		if (packet_len + 2 > SIZE_NETWORK_BUFFER) {
+			delete[] net_server_read;
 			ServerEchoEvent(bev, BEV_EVENT_ERROR, 0);
 			return;
 		}
 		if (len < packet_len + 2)
-			return;
-		if (packet_len < 1)
-			return;
-		read_len = evbuffer_remove(input, net_server_read, packet_len + 2);
+			break;
+		int read_len = evbuffer_remove(input, net_server_read, packet_len + 2);
 		if (read_len >= 3)
 			HandleCTOSPacket(&users[bev], &net_server_read[2], read_len - 2);
 		len -= packet_len + 2;
 	}
+	delete[] net_server_read;
 }
 void NetServer::ServerEchoEvent(bufferevent* bev, short events, void* ctx) {
 	if (events & (BEV_EVENT_EOF | BEV_EVENT_ERROR)) {
@@ -340,7 +338,8 @@ void NetServer::HandleCTOSPacket(DuelPlayer* dp, unsigned char* data, int len) {
 			return;
 		CTOS_PlayerInfo packet;
 		std::memcpy(&packet, pdata, sizeof packet);
-		const auto* pkt = &packet;
+		auto pkt = &packet;
+		BufferIO::NullTerminate(pkt->name);
 		BufferIO::CopyWStr(pkt->name, dp->name, 20);
 		break;
 	}
@@ -362,10 +361,10 @@ void NetServer::HandleCTOSPacket(DuelPlayer* dp, unsigned char* data, int len) {
 			duel_mode = new TagDuel();
 			duel_mode->etimer = event_new(net_evbase, 0, EV_TIMEOUT | EV_PERSIST, TagDuel::TagTimer, duel_mode);
 		}
-		if(pkt->info.rule > 5)
-			pkt->info.rule = 5;
-		if(pkt->info.mode > 2)
-			pkt->info.mode = 0;
+		if(pkt->info.rule > CURRENT_RULE)
+			pkt->info.rule = CURRENT_RULE;
+		if(pkt->info.mode > MODE_TAG)
+			pkt->info.mode = MODE_SINGLE;
 		unsigned int hash = 1;
 		for(auto lfit = deckManager._lfList.begin(); lfit != deckManager._lfList.end(); ++lfit) {
 			if(pkt->info.lflist == lfit->hash) {
@@ -375,8 +374,9 @@ void NetServer::HandleCTOSPacket(DuelPlayer* dp, unsigned char* data, int len) {
 		}
 		if(hash == 1)
 			pkt->info.lflist = deckManager._lfList[0].hash;
-		std::memcpy(pdata, &packet, sizeof packet);
 		duel_mode->host_info = pkt->info;
+		BufferIO::NullTerminate(pkt->name);
+		BufferIO::NullTerminate(pkt->pass);
 		BufferIO::CopyWStr(pkt->name, duel_mode->name, 20);
 		BufferIO::CopyWStr(pkt->pass, duel_mode->pass, 20);
 		duel_mode->JoinGame(dp, 0, true);

gframe/netserver.h

@@ -20,8 +20,6 @@ private:
 	static event* broadcast_ev;
 	static evconnlistener* listener;
 	static DuelMode* duel_mode;
-	static unsigned char net_server_read[SIZE_NETWORK_BUFFER];
-	static int read_len;
 	static unsigned char net_server_write[SIZE_NETWORK_BUFFER];
 	static unsigned short last_sent;
 
@@ -60,15 +58,14 @@ public:
 	template<typename ST>
 	static void SendPacketToPlayer(DuelPlayer* dp, unsigned char proto, ST& st) {
 		auto p = net_server_write;
-		int blen = sizeof(ST);
-		if (blen > MAX_DATA_SIZE)
+		if ((int)sizeof(ST) > MAX_DATA_SIZE)
 			return;
-		BufferIO::WriteInt16(p, (short)(1 + blen));
+		BufferIO::WriteInt16(p, (short)(1 + sizeof(ST)));
 		BufferIO::WriteInt8(p, proto);
-		std::memcpy(p, &st, blen);
-		last_sent = blen + 3;
+		std::memcpy(p, &st, sizeof(ST));
+		last_sent = sizeof(ST) + 3;
 		if (dp)
-			bufferevent_write(dp->bev, net_server_write, blen + 3);
+			bufferevent_write(dp->bev, net_server_write, sizeof(ST) + 3);
 	}
 	static void SendBufferToPlayer(DuelPlayer* dp, unsigned char proto, void* buffer, size_t len) {
 		auto p = net_server_write;

gframe/single_duel.cpp

@@ -50,7 +50,7 @@ void SingleDuel::JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater)
 		}
 		CTOS_JoinGame packet;
 		std::memcpy(&packet, pdata, sizeof packet);
-		const auto* pkt = &packet;
+		auto* pkt = &packet;
 		/* disabled version check
 		if(pkt->version != PRO_VERSION) {
 			STOC_ErrorMsg scem;
@@ -62,6 +62,7 @@ void SingleDuel::JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater)
 		}
 		*/
 		wchar_t jpass[20];
+		BufferIO::NullTerminate(pkt->pass);
 		BufferIO::CopyWStr(pkt->pass, jpass, 20);
 #ifdef YGOPRO_SERVER_MODE
 		if(!wcscmp(jpass, L"the Big Brother") && !cache_recorder) {
@@ -1801,7 +1802,7 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
 	return 0;
 }
 void SingleDuel::GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) {
-	byte resb[SIZE_RETURN_VALUE];
+	byte resb[SIZE_RETURN_VALUE]{};
 	if (len > SIZE_RETURN_VALUE)
 		len = SIZE_RETURN_VALUE;
 	std::memcpy(resb, pdata, len);

gframe/tag_duel.cpp

@@ -54,7 +54,7 @@ void TagDuel::JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater) {
 		}
 		CTOS_JoinGame packet;
 		std::memcpy(&packet, pdata, sizeof packet);
-		const auto* pkt = &packet;
+		auto* pkt = &packet;
 		/* disabled version check
 		if(pkt->version != PRO_VERSION) {
 			STOC_ErrorMsg scem;
@@ -66,6 +66,7 @@ void TagDuel::JoinGame(DuelPlayer* dp, unsigned char* pdata, bool is_creater) {
 		}
 		*/
 		wchar_t jpass[20];
+		BufferIO::NullTerminate(pkt->pass);
 		BufferIO::CopyWStr(pkt->pass, jpass, 20);
 #ifdef YGOPRO_SERVER_MODE
 		if(!wcscmp(jpass, L"the Big Brother") && !cache_recorder) {
@@ -1911,7 +1912,7 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
 	return 0;
 }
 void TagDuel::GetResponse(DuelPlayer* dp, unsigned char* pdata, unsigned int len) {
-	byte resb[SIZE_RETURN_VALUE];
+	byte resb[SIZE_RETURN_VALUE]{};
 	if (len > SIZE_RETURN_VALUE)
 		len = SIZE_RETURN_VALUE;
 	std::memcpy(resb, pdata, len);

ocgcore @ 53940410

-Subproject commit f2b08bd829e232bf623456f80d5b2d82f8d7eb3e
+Subproject commit 53940410bcb65ab5834fbdf0f0fa981a8b8cfa2a

script @ d586ed33

-Subproject commit eccdab4349138c7c4aa1f2f44ea994dfa98c0b79
+Subproject commit d586ed33029906f56e07084a72e25b5a8b195d57

strings.conf

@@ -1230,3 +1230,5 @@
 !setname 0x1b1 白森林	白き森
 !setname 0x1b2 欢聚友伴	マルチャミー
 !setname 0x1b3 徽记	エンブレーマ
+!setname 0x1b4 时空	タキオン
+!setname 0x1b5 蓝泪	青い涙