aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-jdwp.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-jdwp.c')
-rw-r--r--epan/dissectors/packet-jdwp.c99
1 files changed, 61 insertions, 38 deletions
diff --git a/epan/dissectors/packet-jdwp.c b/epan/dissectors/packet-jdwp.c
index 28ae82a6b3..e669a62042 100644
--- a/epan/dissectors/packet-jdwp.c
+++ b/epan/dissectors/packet-jdwp.c
@@ -11,8 +11,6 @@
#include "config.h"
-#include <stdio.h>
-
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/expert.h>
@@ -25,12 +23,17 @@
void proto_register_jdwp(void);
void proto_reg_handoff_jdwp(void);
+static dissector_handle_t jdwp_handle;
+
/* IMPORTANT IMPLEMENTATION NOTES
*
* You need to be looking at:
*
* https://docs.oracle.com/javase/8/docs/technotes/guides/jpda/jdwp-spec.html
*
+ * Last update: up to Java 19
+ *
+ * https://docs.oracle.com/en/java/javase/19/docs/specs/jdwp/jdwp-protocol.html
*
*/
@@ -59,39 +62,41 @@ void proto_reg_handoff_jdwp(void);
#define COMMAND_SET_EVENTREQUEST 15
#define COMMAND_SET_STACKFRAME 16
#define COMMAND_SET_CLASSOBJECTREFERENCE 17
+#define COMMAND_SET_MODULEREFERENCE 18
#define COMMAND_SET_EVENT 64
-static int proto_jdwp = -1;
-
-static int hf_jdwp_type = -1;
-static int hf_jdwp_length = -1;
-static int hf_jdwp_id = -1;
-static int hf_jdwp_flags = -1;
-static int hf_jdwp_commandset = -1;
-static int hf_jdwp_commandset_virtualmachine = -1;
-static int hf_jdwp_commandset_referencetype = -1;
-static int hf_jdwp_commandset_classtype = -1;
-static int hf_jdwp_commandset_arraytype = -1;
-static int hf_jdwp_commandset_interfacetype = -1;
-static int hf_jdwp_commandset_method = -1;
-static int hf_jdwp_commandset_field = -1;
-static int hf_jdwp_commandset_objectreference = -1;
-static int hf_jdwp_commandset_stringreference = -1;
-static int hf_jdwp_commandset_threadreference = -1;
-static int hf_jdwp_commandset_threadgroupreference = -1;
-static int hf_jdwp_commandset_arrayreference = -1;
-static int hf_jdwp_commandset_classloaderreference = -1;
-static int hf_jdwp_commandset_eventrequest = -1;
-static int hf_jdwp_commandset_stackframe = -1;
-static int hf_jdwp_commandset_classobjectreference = -1;
-static int hf_jdwp_commandset_event = -1;
-static int hf_jdwp_errorcode = -1;
-static int hf_jdwp_data = -1;
-
-static gint ett_jdwp = -1;
-
-static expert_field ei_jdwp_hlen_invalid = EI_INIT;
-static expert_field ei_jdwp_flags_invalid = EI_INIT;
+static int proto_jdwp;
+
+static int hf_jdwp_type;
+static int hf_jdwp_length;
+static int hf_jdwp_id;
+static int hf_jdwp_flags;
+static int hf_jdwp_commandset;
+static int hf_jdwp_commandset_virtualmachine;
+static int hf_jdwp_commandset_referencetype;
+static int hf_jdwp_commandset_classtype;
+static int hf_jdwp_commandset_arraytype;
+static int hf_jdwp_commandset_interfacetype;
+static int hf_jdwp_commandset_method;
+static int hf_jdwp_commandset_field;
+static int hf_jdwp_commandset_objectreference;
+static int hf_jdwp_commandset_stringreference;
+static int hf_jdwp_commandset_threadreference;
+static int hf_jdwp_commandset_threadgroupreference;
+static int hf_jdwp_commandset_arrayreference;
+static int hf_jdwp_commandset_classloaderreference;
+static int hf_jdwp_commandset_eventrequest;
+static int hf_jdwp_commandset_stackframe;
+static int hf_jdwp_commandset_classobjectreference;
+static int hf_jdwp_commandset_modulereference;
+static int hf_jdwp_commandset_event;
+static int hf_jdwp_errorcode;
+static int hf_jdwp_data;
+
+static gint ett_jdwp;
+
+static expert_field ei_jdwp_hlen_invalid;
+static expert_field ei_jdwp_flags_invalid;
// contains the command set names
static const value_string commandsetnames[] = {
@@ -111,6 +116,7 @@ static const value_string commandsetnames[] = {
{15, "EventRequest"},
{16, "StackFrame"},
{17, "ClassObjectReference"},
+ {18, "ModuleReference"},
{64, "Event"},
{0, NULL}
};
@@ -138,6 +144,7 @@ static const value_string commandset_virtualmachine[] = {
{19, "SetDefaultStratum"},
{20, "AllClassesWithGeneric"},
{21, "InstanceCounts"},
+ {22, "AllModules"},
{0, NULL}
};
@@ -161,6 +168,7 @@ static const value_string commandset_referencetype[] = {
{16, "Instances"},
{17, "ClassFileVersion"},
{18, "ConstantPool"},
+ {19, "Module"},
{0, NULL}
};
@@ -236,6 +244,7 @@ static const value_string commandset_threadreference[] = {
{12, "SuspendCount"},
{13, "OwnedMonitorsStackDepthInfo"},
{14, "ForceEarlyReturn"},
+ {15, "IsVirtual"},
{0, NULL}
};
@@ -284,6 +293,13 @@ static const value_string commandset_classobjectreference[] = {
{0, NULL}
};
+// contains the commands for the command set of type Module Reference
+static const value_string commandset_modulereference[] = {
+ {1, "Name"},
+ {2, "ClassLoader"},
+ {0, NULL}
+};
+
// contains the commands for the command set of type Event
static const value_string commandset_event[] = {
{100, "Composite"},
@@ -420,7 +436,7 @@ dissect_jdwp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
}
if (packet_type == 0) {
- proto_tree_add_item(jdwp_tree, hf_jdwp_type, tvb, offset, 14, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(jdwp_tree, hf_jdwp_type, tvb, offset, 14, ENC_ASCII);
return tvb_captured_length(tvb);
}
@@ -529,6 +545,11 @@ dissect_jdwp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
offset += 1;
break;
+ case COMMAND_SET_MODULEREFERENCE:
+ proto_tree_add_item(jdwp_tree, hf_jdwp_commandset_modulereference, tvb, offset, 1, ENC_BIG_ENDIAN);
+ offset += 1;
+ break;
+
case COMMAND_SET_EVENT:
proto_tree_add_item(jdwp_tree, hf_jdwp_commandset_event, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
@@ -676,12 +697,16 @@ proto_register_jdwp(void)
{ "command", "jdwp.command", FT_UINT8, BASE_DEC, VALS(commandset_classobjectreference), 0x0, NULL,
HFILL }
},
+ { &hf_jdwp_commandset_modulereference,
+ { "command", "jdwp.command", FT_UINT8, BASE_DEC, VALS(commandset_modulereference), 0x0, NULL,
+ HFILL }
+ },
{ &hf_jdwp_commandset_event,
{ "command", "jdwp.command", FT_UINT8, BASE_DEC, VALS(commandset_event), 0x0, NULL,
HFILL }
},
{ &hf_jdwp_errorcode,
- { "error code", "jdwp.errorcode", FT_UINT8, BASE_DEC, VALS(error_codes), 0x0, NULL,
+ { "error code", "jdwp.errorcode", FT_UINT16, BASE_DEC, VALS(error_codes), 0x0, NULL,
HFILL }
},
{ &hf_jdwp_data,
@@ -700,6 +725,7 @@ proto_register_jdwp(void)
};
proto_jdwp = proto_register_protocol("Java Debug Wire Protocol", "JDWP", "jdwp");
+ jdwp_handle = register_dissector("jdwp", dissect_jdwp, proto_jdwp);
proto_register_field_array(proto_jdwp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
expert_jdwp = expert_register_protocol(proto_jdwp);
@@ -710,9 +736,6 @@ proto_register_jdwp(void)
void
proto_reg_handoff_jdwp(void)
{
- dissector_handle_t jdwp_handle;
-
- jdwp_handle = create_dissector_handle(dissect_jdwp, proto_jdwp);
dissector_add_uint_with_preference("tcp.port", JDWP_PORT, jdwp_handle);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 17:55:54 +0000