incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make tests replayable on non-macos machines

Browse Source
This commit is contained in:
Martin Michelsen
2022-07-08 00:40:43 -07:00
parent 39942dc4bd
commit abe64af17b
5 changed files with 18 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveCommands.cc
+3 -20
View File
@@ -2037,7 +2037,7 @@ void process_encryption_ok_patch(shared_ptr<ServerState>, shared_ptr<Client> c,
send_command(c, 0x04, 0x00); // This requests the user's login information send_command(c, 0x04, 0x00); // This requests the user's login information
} }
void process_login_patch(shared_ptr<ServerState> s, shared_ptr<Client> c, void process_login_patch(shared_ptr<ServerState>, shared_ptr<Client> c,
uint16_t, uint32_t, const string& data) { uint16_t, uint32_t, const string& data) {
const auto& cmd = check_size_t<C_Login_Patch_04>(data); const auto& cmd = check_size_t<C_Login_Patch_04>(data);
@@ -2054,31 +2054,14 @@ $C7newserv patch server\n\
\n\ \n\
This server is not affiliated with, sponsored by, or in any\n\ This server is not affiliated with, sponsored by, or in any\n\
other way connected to SEGA or Sonic Team, and is owned\n\ other way connected to SEGA or Sonic Team, and is owned\n\
and operated completely independently.\n\ and operated completely independently.";
\n";
} else { } else {
message = u"\ message = u"\
newserv patch server\r\n\ newserv patch server\r\n\
\r\n\ \r\n\
This server is not affiliated with, sponsored by, or in any other way \ This server is not affiliated with, sponsored by, or in any other way \
connected to SEGA or Sonic Team, and is owned and operated completely \ connected to SEGA or Sonic Team, and is owned and operated completely \
independently.\r\n\ independently.";
\r\n";
}
message += u"License check ";
try {
shared_ptr<const License> l;
if (c->flags & Client::Flag::BB_PATCH) {
l = s->license_manager->verify_bb(cmd.username, cmd.password);
} else {
l = s->license_manager->verify_pc(
stoul(cmd.username, nullptr, 16), cmd.password);
}
c->set_license(l);
message += u"OK";
} catch (const exception& e) {
message += u"failed: ";
message += decode_sjis(e.what());
} }
send_message_box(c, message.c_str()); send_message_box(c, message.c_str());
tests/BB-CreateCharGame.test.txt
+2 -9
View File
@@ -18,7 +18,7 @@ I 80350 2022-07-07 23:26:14 - [Commands] Received from C-2 (version=Patch comman
0000000000000050 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0000000000000050 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
0000000000000060 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0000000000000060 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
I 80350 2022-07-07 23:26:14 - [Commands] Sending to C-2 (version=Patch command=13 flag=00) I 80350 2022-07-07 23:26:14 - [Commands] Sending to C-2 (version=Patch command=13 flag=00)
0000000000000000 | E0 01 13 00 09 00 43 00 37 00 6E 00 65 00 77 00 | C 7 n e w 0000000000000000 | 70 01 13 00 09 00 43 00 37 00 6E 00 65 00 77 00 | p C 7 n e w
0000000000000010 | 73 00 65 00 72 00 76 00 20 00 70 00 61 00 74 00 | s e r v p a t 0000000000000010 | 73 00 65 00 72 00 76 00 20 00 70 00 61 00 74 00 | s e r v p a t
0000000000000020 | 63 00 68 00 20 00 73 00 65 00 72 00 76 00 65 00 | c h s e r v e 0000000000000020 | 63 00 68 00 20 00 73 00 65 00 72 00 76 00 65 00 | c h s e r v e
0000000000000030 | 72 00 0A 00 0A 00 54 00 68 00 69 00 73 00 20 00 | r T h i s 0000000000000030 | 72 00 0A 00 0A 00 54 00 68 00 69 00 73 00 20 00 | r T h i s
@@ -40,14 +40,7 @@ I 80350 2022-07-07 23:26:14 - [Commands] Sending to C-2 (version=Patch command=1
0000000000000130 | 74 00 65 00 64 00 20 00 63 00 6F 00 6D 00 70 00 | t e d c o m p 0000000000000130 | 74 00 65 00 64 00 20 00 63 00 6F 00 6D 00 70 00 | t e d c o m p
0000000000000140 | 6C 00 65 00 74 00 65 00 6C 00 79 00 20 00 69 00 | l e t e l y i 0000000000000140 | 6C 00 65 00 74 00 65 00 6C 00 79 00 20 00 69 00 | l e t e l y i
0000000000000150 | 6E 00 64 00 65 00 70 00 65 00 6E 00 64 00 65 00 | n d e p e n d e 0000000000000150 | 6E 00 64 00 65 00 70 00 65 00 6E 00 64 00 65 00 | n d e p e n d e
0000000000000160 | 6E 00 74 00 6C 00 79 00 2E 00 0A 00 0A 00 4C 00 | n t l y . L 0000000000000160 | 6E 00 74 00 6C 00 79 00 2E 00 00 00 00 00 00 00 | n t l y .
0000000000000170 | 69 00 63 00 65 00 6E 00 73 00 65 00 20 00 63 00 | i c e n s e c
0000000000000180 | 68 00 65 00 63 00 6B 00 20 00 66 00 61 00 69 00 | h e c k f a i
0000000000000190 | 6C 00 65 00 64 00 3A 00 20 00 75 00 6E 00 6F 00 | l e d : u n o
00000000000001A0 | 72 00 64 00 65 00 72 00 65 00 64 00 5F 00 6D 00 | r d e r e d _ m
00000000000001B0 | 61 00 70 00 3A 00 3A 00 61 00 74 00 3A 00 20 00 | a p : : a t :
00000000000001C0 | 6B 00 65 00 79 00 20 00 6E 00 6F 00 74 00 20 00 | k e y n o t
00000000000001D0 | 66 00 6F 00 75 00 6E 00 64 00 00 00 00 00 00 00 | f o u n d
I 80350 2022-07-07 23:26:14 - [Commands] Sending to C-2 (version=Patch command=09 flag=00) I 80350 2022-07-07 23:26:14 - [Commands] Sending to C-2 (version=Patch command=09 flag=00)
0000000000000000 | 44 00 09 00 2E 00 00 00 00 00 00 00 00 00 00 00 | D . 0000000000000000 | 44 00 09 00 2E 00 00 00 00 00 00 00 00 00 00 00 | D .
0000000000000010 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0000000000000010 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
tests/GC-ForestGame.test.txt
+5 -8
View File
@@ -94,7 +94,7 @@ I 26579 2022-07-01 10:22:13 - [Commands] Received from C-5C (version=GC command=
I 26579 2022-07-01 10:22:14 - [Commands] Received from C-5C (version=GC command=00D6 flag=00000000) I 26579 2022-07-01 10:22:14 - [Commands] Received from C-5C (version=GC command=00D6 flag=00000000)
0000000000000000 | D6 00 04 00 | 0000000000000000 | D6 00 04 00 |
I 26579 2022-07-01 10:22:14 - [Commands] Sending to C-5C (version=GC command=0007 flag=00000008) I 26579 2022-07-01 10:22:14 - [Commands] Sending to C-5C (version=GC command=0007 flag=00000008)
0000000000000000 | 07 08 00 01 11 00 00 11 FF FF FF FF 04 00 41 6C | Al 0000000000000000 | 07 06 C8 00 11 00 00 11 FF FF FF FF 04 00 41 6C | Al
0000000000000010 | 65 78 61 6E 64 72 69 61 00 00 00 00 00 00 00 00 | exandria 0000000000000010 | 65 78 61 6E 64 72 69 61 00 00 00 00 00 00 00 00 | exandria
0000000000000020 | 11 00 00 11 11 22 22 11 04 0F 47 6F 20 74 6F 20 | "" Go to 0000000000000020 | 11 00 00 11 11 22 22 11 04 0F 47 6F 20 74 6F 20 | "" Go to
0000000000000030 | 6C 6F 62 62 79 00 00 00 00 00 00 00 11 00 00 11 | lobby 0000000000000030 | 6C 6F 62 62 79 00 00 00 00 00 00 00 11 00 00 11 | lobby
@@ -103,13 +103,10 @@ I 26579 2022-07-01 10:22:14 - [Commands] Sending to C-5C (version=GC command=000
0000000000000060 | 04 0F 50 72 6F 78 79 20 73 65 72 76 65 72 00 00 | Proxy server 0000000000000060 | 04 0F 50 72 6F 78 79 20 73 65 72 76 65 72 00 00 | Proxy server
0000000000000070 | 00 00 00 00 11 00 00 11 11 44 44 11 04 0F 44 6F | DD Do 0000000000000070 | 00 00 00 00 11 00 00 11 11 44 44 11 04 0F 44 6F | DD Do
0000000000000080 | 77 6E 6C 6F 61 64 20 71 75 65 73 74 73 00 00 00 | wnload quests 0000000000000080 | 77 6E 6C 6F 61 64 20 71 75 65 73 74 73 00 00 00 | wnload quests
0000000000000090 | 11 00 00 11 11 66 66 11 04 0F 50 61 74 63 68 65 | ff Patche 0000000000000090 | 11 00 00 11 11 88 88 11 04 0F 44 69 73 63 6F 6E | Discon
00000000000000A0 | 73 00 00 00 00 00 00 00 00 00 00 00 11 00 00 11 | s 00000000000000A0 | 6E 65 63 74 00 00 00 00 00 00 00 00 11 00 00 11 | nect
00000000000000B0 | 11 77 77 11 04 0F 50 72 6F 67 72 61 6D 73 00 00 | ww Programs 00000000000000B0 | 11 99 99 11 04 0F 43 6C 65 61 72 20 6C 69 63 65 | Clear lice
00000000000000C0 | 00 00 00 00 00 00 00 00 11 00 00 11 11 88 88 11 | 00000000000000C0 | 6E 73 65 00 00 00 00 00 | nse
00000000000000D0 | 04 0F 44 69 73 63 6F 6E 6E 65 63 74 00 00 00 00 | Disconnect
00000000000000E0 | 00 00 00 00 11 00 00 11 11 99 99 11 04 0F 43 6C | Cl
00000000000000F0 | 65 61 72 20 6C 69 63 65 6E 73 65 00 00 00 00 00 | ear license
I 26579 2022-07-01 10:22:14 - [Commands] Sending to C-5C (version=GC command=0004 flag=00000000) I 26579 2022-07-01 10:22:14 - [Commands] Sending to C-5C (version=GC command=0004 flag=00000000)
0000000000000000 | 04 00 2C 00 00 00 01 00 78 62 F8 10 39 98 AC 82 | , xb 9 0000000000000000 | 04 00 2C 00 00 00 01 00 78 62 F8 10 39 98 AC 82 | , xb 9
0000000000000010 | 0E 89 2A 49 00 00 00 00 00 00 00 00 FF FF FF FF | *I 0000000000000010 | 0E 89 2A 49 00 00 00 00 00 00 00 00 FF FF FF FF | *I
tests/GC-LoginSmokeTest.test.txt
+6 -8
View File
@@ -94,7 +94,7 @@ I 22913 2022-06-30 23:45:39 - [Commands] Received from C-2 (version=GC command=0
I 22913 2022-06-30 23:45:40 - [Commands] Received from C-2 (version=GC command=00D6 flag=00000000) I 22913 2022-06-30 23:45:40 - [Commands] Received from C-2 (version=GC command=00D6 flag=00000000)
0000000000000000 | D6 00 04 00 | 0000000000000000 | D6 00 04 00 |
I 22913 2022-06-30 23:45:40 - [Commands] Sending to C-2 (version=GC command=0007 flag=00000008) I 22913 2022-06-30 23:45:40 - [Commands] Sending to C-2 (version=GC command=0007 flag=00000008)
0000000000000000 | 07 08 00 01 11 00 00 11 FF FF FF FF 04 00 41 6C | Al 0000000000000000 | 07 06 C8 00 11 00 00 11 FF FF FF FF 04 00 41 6C | Al
0000000000000010 | 65 78 61 6E 64 72 69 61 00 00 00 00 00 00 00 00 | exandria 0000000000000010 | 65 78 61 6E 64 72 69 61 00 00 00 00 00 00 00 00 | exandria
0000000000000020 | 11 00 00 11 11 22 22 11 04 0F 47 6F 20 74 6F 20 | "" Go to 0000000000000020 | 11 00 00 11 11 22 22 11 04 0F 47 6F 20 74 6F 20 | "" Go to
0000000000000030 | 6C 6F 62 62 79 00 00 00 00 00 00 00 11 00 00 11 | lobby 0000000000000030 | 6C 6F 62 62 79 00 00 00 00 00 00 00 11 00 00 11 | lobby
@@ -103,13 +103,11 @@ I 22913 2022-06-30 23:45:40 - [Commands] Sending to C-2 (version=GC command=0007
0000000000000060 | 04 0F 50 72 6F 78 79 20 73 65 72 76 65 72 00 00 | Proxy server 0000000000000060 | 04 0F 50 72 6F 78 79 20 73 65 72 76 65 72 00 00 | Proxy server
0000000000000070 | 00 00 00 00 11 00 00 11 11 44 44 11 04 0F 44 6F | DD Do 0000000000000070 | 00 00 00 00 11 00 00 11 11 44 44 11 04 0F 44 6F | DD Do
0000000000000080 | 77 6E 6C 6F 61 64 20 71 75 65 73 74 73 00 00 00 | wnload quests 0000000000000080 | 77 6E 6C 6F 61 64 20 71 75 65 73 74 73 00 00 00 | wnload quests
0000000000000090 | 11 00 00 11 11 66 66 11 04 0F 50 61 74 63 68 65 | ff Patche 0000000000000090 | 11 00 00 11 11 88 88 11 04 0F 44 69 73 63 6F 6E | Discon
00000000000000A0 | 73 00 00 00 00 00 00 00 00 00 00 00 11 00 00 11 | s 00000000000000A0 | 6E 65 63 74 00 00 00 00 00 00 00 00 11 00 00 11 | nect
00000000000000B0 | 11 77 77 11 04 0F 50 72 6F 67 72 61 6D 73 00 00 | ww Programs 00000000000000B0 | 11 99 99 11 04 0F 43 6C 65 61 72 20 6C 69 63 65 | Clear lice
00000000000000C0 | 00 00 00 00 00 00 00 00 11 00 00 11 11 88 88 11 | 00000000000000C0 | 6E 73 65 00 00 00 00 00 | nse
00000000000000D0 | 04 0F 44 69 73 63 6F 6E 6E 65 63 74 00 00 00 00 | Disconnect
00000000000000E0 | 00 00 00 00 11 00 00 11 11 99 99 11 04 0F 43 6C | Cl
00000000000000F0 | 65 61 72 20 6C 69 63 65 6E 73 65 00 00 00 00 00 | ear license
I 22913 2022-06-30 23:45:40 - [Commands] Sending to C-2 (version=GC command=0004 flag=00000000) I 22913 2022-06-30 23:45:40 - [Commands] Sending to C-2 (version=GC command=0004 flag=00000000)
0000000000000000 | 04 00 2C 00 00 00 01 00 78 62 F8 10 39 98 AC 82 | , xb 9 0000000000000000 | 04 00 2C 00 00 00 01 00 78 62 F8 10 39 98 AC 82 | , xb 9
0000000000000010 | 0E 89 2A 49 00 00 00 00 00 00 00 00 FF FF FF FF | *I 0000000000000010 | 0E 89 2A 49 00 00 00 00 00 00 00 00 FF FF FF FF | *I
tests/PC-BasicGame.test.txt
+2 -9
View File
@@ -18,7 +18,7 @@ I 80820 2022-07-07 23:33:27 - [Commands] Received from C-1 (version=Patch comman
0000000000000050 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0000000000000050 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
0000000000000060 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0000000000000060 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
I 80820 2022-07-07 23:33:27 - [Commands] Sending to C-1 (version=Patch command=13 flag=00) I 80820 2022-07-07 23:33:27 - [Commands] Sending to C-1 (version=Patch command=13 flag=00)
0000000000000000 | E0 01 13 00 09 00 43 00 37 00 6E 00 65 00 77 00 | C 7 n e w 0000000000000000 | 70 01 13 00 09 00 43 00 37 00 6E 00 65 00 77 00 | p C 7 n e w
0000000000000010 | 73 00 65 00 72 00 76 00 20 00 70 00 61 00 74 00 | s e r v p a t 0000000000000010 | 73 00 65 00 72 00 76 00 20 00 70 00 61 00 74 00 | s e r v p a t
0000000000000020 | 63 00 68 00 20 00 73 00 65 00 72 00 76 00 65 00 | c h s e r v e 0000000000000020 | 63 00 68 00 20 00 73 00 65 00 72 00 76 00 65 00 | c h s e r v e
0000000000000030 | 72 00 0A 00 0A 00 54 00 68 00 69 00 73 00 20 00 | r T h i s 0000000000000030 | 72 00 0A 00 0A 00 54 00 68 00 69 00 73 00 20 00 | r T h i s
@@ -40,14 +40,7 @@ I 80820 2022-07-07 23:33:27 - [Commands] Sending to C-1 (version=Patch command=1
0000000000000130 | 74 00 65 00 64 00 20 00 63 00 6F 00 6D 00 70 00 | t e d c o m p 0000000000000130 | 74 00 65 00 64 00 20 00 63 00 6F 00 6D 00 70 00 | t e d c o m p
0000000000000140 | 6C 00 65 00 74 00 65 00 6C 00 79 00 20 00 69 00 | l e t e l y i 0000000000000140 | 6C 00 65 00 74 00 65 00 6C 00 79 00 20 00 69 00 | l e t e l y i
0000000000000150 | 6E 00 64 00 65 00 70 00 65 00 6E 00 64 00 65 00 | n d e p e n d e 0000000000000150 | 6E 00 64 00 65 00 70 00 65 00 6E 00 64 00 65 00 | n d e p e n d e
0000000000000160 | 6E 00 74 00 6C 00 79 00 2E 00 0A 00 0A 00 4C 00 | n t l y . L 0000000000000160 | 6E 00 74 00 6C 00 79 00 2E 00 00 00 00 00 00 00 | n t l y .
0000000000000170 | 69 00 63 00 65 00 6E 00 73 00 65 00 20 00 63 00 | i c e n s e c
0000000000000180 | 68 00 65 00 63 00 6B 00 20 00 66 00 61 00 69 00 | h e c k f a i
0000000000000190 | 6C 00 65 00 64 00 3A 00 20 00 75 00 6E 00 6F 00 | l e d : u n o
00000000000001A0 | 72 00 64 00 65 00 72 00 65 00 64 00 5F 00 6D 00 | r d e r e d _ m
00000000000001B0 | 61 00 70 00 3A 00 3A 00 61 00 74 00 3A 00 20 00 | a p : : a t :
00000000000001C0 | 6B 00 65 00 79 00 20 00 6E 00 6F 00 74 00 20 00 | k e y n o t
00000000000001D0 | 66 00 6F 00 75 00 6E 00 64 00 00 00 00 00 00 00 | f o u n d
I 80820 2022-07-07 23:33:27 - [Commands] Sending to C-1 (version=Patch command=09 flag=00) I 80820 2022-07-07 23:33:27 - [Commands] Sending to C-1 (version=Patch command=09 flag=00)
0000000000000000 | 44 00 09 00 2E 00 00 00 00 00 00 00 00 00 00 00 | D . 0000000000000000 | 44 00 09 00 2E 00 00 00 00 00 00 00 00 00 00 00 | D .
0000000000000010 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 | 0000000000000010 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |