osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

D-Bus: Add member to response frame in info column 

Add the method name to response frames, like Method Return and Error.
The name is not included in the frame itself, but can be inferred with
conversation tracking.
This commit is contained in:
Simon Holesch 2021-12-10 22:50:58 +01:00 committed by AndersBroman
parent 60aec65e9f
commit 034ac6dad9
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
epan/dissectors/packet-dbus.c
View File

@ -1236,26 +1236,39 @@ dissect_dbus_header_fields(dbus_packet_t *packet) {
return 1;
}
add_conversation(packet, proto_item_get_subtree(header_field_array_pi));
switch(packet->message_type) {
case DBUS_MESSAGE_TYPE_METHOD_CALL:
col_add_fstr(packet->pinfo->cinfo, COL_INFO, "%s() @ %s", packet->member, packet->path);
col_add_fstr(packet->pinfo->cinfo, COL_INFO, "%s(%s) @ %s", packet->member, packet->signature, packet->path);
break;
case DBUS_MESSAGE_TYPE_SIGNAL:
col_add_fstr(packet->pinfo->cinfo, COL_INFO, "* %s() @ %s", packet->member, packet->path);
col_add_fstr(packet->pinfo->cinfo, COL_INFO, "* %s(%s) @ %s", packet->member, packet->signature, packet->path);
break;
case DBUS_MESSAGE_TYPE_ERROR:
col_add_fstr(packet->pinfo->cinfo, COL_INFO, "-> %s", packet->error_name);
if (packet->member) {
col_add_fstr(packet->pinfo->cinfo, COL_INFO, "! %s: %s", packet->member, packet->error_name);
} else {
col_add_fstr(packet->pinfo->cinfo, COL_INFO, "! %s", packet->error_name);
}
break;
case DBUS_MESSAGE_TYPE_METHOD_RETURN:
col_add_fstr(packet->pinfo->cinfo, COL_INFO, "-> '%s'", packet->signature);
if (packet->member) {
if (*packet->signature != '\0') {
col_add_fstr(packet->pinfo->cinfo, COL_INFO, "-> %s: '%s'", packet->member, packet->signature);
} else {
col_add_fstr(packet->pinfo->cinfo, COL_INFO, "-> %s: OK", packet->member);
}
} else {
col_add_fstr(packet->pinfo->cinfo, COL_INFO, "-> '%s'", packet->signature);
}
break;
default:
DISSECTOR_ASSERT_NOT_REACHED();
break;
}
add_conversation(packet, proto_item_get_subtree(header_field_array_pi));
// Header length must be a multiple of 8 bytes
return add_padding(packet, SIG_CODE_STRUCT_OPEN);
}