aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Gotthard <petr.gotthard@honeywell.com>2015-01-20 19:04:05 +0100
committerAnders Broman <a.broman58@gmail.com>2015-01-23 13:15:56 +0000
commitcce3ad281e6e26f5d8101d6f70d1336ebc7d1b55 (patch)
tree850f77b576e3b6929e3e56afe9f7feb0f280fc70
parentb32e39e19858120785b045d54acc4557cde2d929 (diff)
Correctly dissect the AMQP 0-9 heartbeat frames. The heartbeat frames were
incorrectly highlighted as erroneous. Change-Id: I94f8ef73e2432543ae3965da3789f27e872951ea Reviewed-on: https://code.wireshark.org/review/6685 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-amqp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index a206d2ddee..625b511986 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -7910,6 +7910,11 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
col_append_str(pinfo->cinfo, COL_INFO, "Content-Body ");
col_set_fence(pinfo->cinfo, COL_INFO);
break;
+ case AMQP_0_9_FRAME_TYPE_HEARTBEAT:
+ col_append_str(pinfo->cinfo, COL_INFO,
+ "Heartbeat ");
+ col_set_fence(pinfo->cinfo, COL_INFO);
+ break;
default:
expert_add_info_format(pinfo, amqp_tree, &ei_amqp_unknown_frame_type, "Unknown frame type %u", frame_type);
}