From ca64f564cd23dba45bc93b57a718dfe81df5ba27 Mon Sep 17 00:00:00 2001 From: sofar Date: Tue, 26 Dec 2017 05:06:31 -0800 Subject: [PATCH] Wireshark plugin: Complete all commands. (#6841) This still leaves plenty of data undecoded, but just having the packet types all covered 100% for 0.4.16 will make looking at traces a lot simpler than seeing half the packets show up as unknown. --- util/wireshark/minetest.lua | 52 ++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/util/wireshark/minetest.lua b/util/wireshark/minetest.lua index 908cc5633..a8c22428f 100644 --- a/util/wireshark/minetest.lua +++ b/util/wireshark/minetest.lua @@ -42,6 +42,7 @@ minetest_client_commands = {} minetest_client_obsolete = {} -- TOSERVER_INIT +minetest_client_commands[0x02] = { "INIT", 2 } do local f_ser_fmt = ProtoField.uint8("minetest.client.init_ser_version", @@ -51,7 +52,7 @@ do local f_version = ProtoField.uint16("minetest.client.init_version", "Version", base.DEC) minetest_client_commands[0x10] = { - "INIT", -- Command name + "INIT_LEGACY", -- Command name 53, -- Minimum message length including code { f_ser_fmt, -- List of fields [optional] f_player_name, @@ -428,9 +429,19 @@ do end -- TOSERVER_RESPAWN - minetest_client_commands[0x38] = { "RESPAWN", 2 } +minetest_client_commands[0x39] = { "INTERACT", 2 } +minetest_client_commands[0x3a] = { "REMOVED_SOUNDS", 2 } +minetest_client_commands[0x3b] = { "NODEMETA_FIELDS", 2 } +minetest_client_commands[0x3c] = { "INVENTORY_FIELDS", 2 } +minetest_client_commands[0x40] = { "REQUEST_MEDIA", 2 } +minetest_client_commands[0x41] = { "RECEIVED_MEDIA", 2 } +minetest_client_commands[0x42] = { "BREATH", 2 } +minetest_client_commands[0x43] = { "CLIENT_READY", 2 } +minetest_client_commands[0x50] = { "FIRST_SRP", 2 } +minetest_client_commands[0x51] = { "SRP_BYTES_A", 2 } +minetest_client_commands[0x52] = { "SRP_BYTES_M", 2 } @@ -444,6 +455,12 @@ minetest_server_obsolete = {} -- TOCLIENT_INIT +minetest_server_commands[0x02] = {"HELLO", 2} +minetest_server_commands[0x03] = {"AUTH_ACCEPT", 2} +minetest_server_commands[0x04] = {"ACCEPT_SUDO_MODE", 2} +minetest_server_commands[0x05] = {"DENY_SUDO_MODE", 2} +minetest_server_commands[0x0A] = {"ACCESS_DENIED", 2} + do local f_version = ProtoField.uint8("minetest.server.init_version", "Deployed version", base.DEC) local f_pos_x = ProtoField.int16("minetest.server.init_pos_x", "Position X", base.DEC) @@ -974,7 +991,36 @@ do } end - +minetest_server_commands[0x38] = {"MEDIA", 2} +minetest_server_commands[0x39] = {"TOOLDEF", 2} +minetest_server_commands[0x3a] = {"NODEDEF", 2} +minetest_server_commands[0x3b] = {"CRAFTITEMDEF", 2} +minetest_server_commands[0x3c] = {"ANNOUNCE_MEDIA", 2} +minetest_server_commands[0x3d] = {"ITEMDEF", 2} +minetest_server_commands[0x3f] = {"PLAY_SOUND", 2} +minetest_server_commands[0x40] = {"STOP_SOUND", 2} +minetest_server_commands[0x41] = {"PRIVILEGES", 2} +minetest_server_commands[0x42] = {"INVENTORY_FORMSPEC", 2} +minetest_server_commands[0x43] = {"DETACHED_INVENTORY", 2} +minetest_server_commands[0x44] = {"SHOW_FORMSPEC", 2} +minetest_server_commands[0x45] = {"MOVEMENT", 2} +minetest_server_commands[0x46] = {"SPAWN_PARTICLE", 2} +minetest_server_commands[0x47] = {"ADD_PARTICLE_SPAWNER", 2} +minetest_server_commands[0x48] = {"DELETE_PARTICLESPAWNER_LEGACY", 2} +minetest_server_commands[0x49] = {"HUDADD", 2} +minetest_server_commands[0x4a] = {"HUDRM", 2} +minetest_server_commands[0x4b] = {"HUDCHANGE", 2} +minetest_server_commands[0x4c] = {"HUD_SET_FLAGS", 2} +minetest_server_commands[0x4d] = {"HUD_SET_PARAM", 2} +minetest_server_commands[0x4e] = {"BREATH", 2} +minetest_server_commands[0x4f] = {"SET_SKY", 2} +minetest_server_commands[0x50] = {"OVERRIDE_DAY_NIGHT_RATIO", 2} +minetest_server_commands[0x51] = {"LOCAL_PLAYER_ANIMATIONS", 2} +minetest_server_commands[0x52] = {"EYE_OFFSET", 2} +minetest_server_commands[0x53] = {"DELETE_PARTICLESPAWNER", 2} +minetest_server_commands[0x54] = {"CLOUD_PARAMS", 2} +minetest_server_commands[0x55] = {"FADE_SOUND", 2} +minetest_server_commands[0x61] = {"SRP_BYTES_S_B", 2} ------------------------------------