aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-amqp.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-amqp.c')
-rw-r--r--epan/dissectors/packet-amqp.c140
1 files changed, 70 insertions, 70 deletions
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 2cf1738037..208df6bdf9 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -3080,7 +3080,7 @@ dissect_amqp_0_10_connection(tvbuff_t *tvb,
hf_amqp_0_10_method_connection_open_capabilities,
tvb,
offset,
- arg_length, ENC_ASCII|ENC_NA);
+ arg_length, ENC_ASCII);
dissect_amqp_0_10_array (tvb,
pinfo,
offset,
@@ -4332,7 +4332,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
if (flag1 & 0x04) { /* binding-key (str8) */
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_binding_key,
- tvb, offset, 1, ENC_ASCII|ENC_NA);
+ tvb, offset, 1, ENC_ASCII);
offset += (1 + tvb_get_guint8(tvb, offset));
}
if (flag1 & 0x08) { /* arguments (map) */
@@ -4374,7 +4374,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
if (flag1 & 0x04) { /* binding-key (str8) */
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_binding_key,
- tvb, offset, 1, ENC_ASCII|ENC_NA);
+ tvb, offset, 1, ENC_ASCII);
/* offset += (1 + tvb_get_guint8(tvb, offset)); */
}
break;
@@ -4397,7 +4397,7 @@ dissect_amqp_0_10_exchange(tvbuff_t *tvb,
if (flag1 & 0x04) { /* binding-key (str8) */
proto_tree_add_item(args_tree,
hf_amqp_0_10_method_exchange_binding_key,
- tvb, offset, 1, ENC_ASCII|ENC_NA);
+ tvb, offset, 1, ENC_ASCII);
offset += (1 + tvb_get_guint8(tvb, offset));
}
if (flag1 & 0x08) { /* arguments (map) */
@@ -6470,7 +6470,7 @@ dissect_amqp_1_0_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
if (tree) {
ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_NA);
amqp_tree = proto_item_add_subtree(ti, ett_amqp_init);
- proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII);
proto_tree_add_item(amqp_tree, hf_amqp_init_id, tvb, 4, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(amqp_tree, hf_amqp_init_version_major, tvb, 5, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(amqp_tree, hf_amqp_init_version_minor, tvb, 6, 1, ENC_BIG_ENDIAN);
@@ -6548,7 +6548,7 @@ dissect_amqp_0_10_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
if (tree) {
ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_NA);
amqp_tree = proto_item_add_subtree(ti, ett_amqp_init);
- proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII);
proto_tree_add_item(amqp_tree, hf_amqp_init_id_major, tvb, 4, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(amqp_tree, hf_amqp_init_id_minor, tvb, 5, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(amqp_tree, hf_amqp_init_version_major, tvb, 6, 1, ENC_BIG_ENDIAN);
@@ -6819,7 +6819,7 @@ dissect_amqp_0_9_method_connection_open(tvbuff_t *tvb, packet_info *pinfo,
/* capabilities (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_0_9_method_connection_open_capabilities,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* insist (bit) */
@@ -6837,7 +6837,7 @@ dissect_amqp_0_9_method_connection_open_ok(tvbuff_t *tvb,
{
/* known-hosts (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_0_9_method_connection_open_ok_known_hosts,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -6856,7 +6856,7 @@ dissect_amqp_0_9_method_connection_redirect(tvbuff_t *tvb,
/* known-hosts (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_0_9_method_connection_redirect_known_hosts,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -6914,7 +6914,7 @@ dissect_amqp_0_9_method_connection_blocked(tvbuff_t *tvb,
{
/* reason (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_connection_blocked_reason,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -6937,7 +6937,7 @@ dissect_amqp_0_9_method_channel_open(tvbuff_t *tvb,
{
/* out-of-band (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_channel_open_out_of_band,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7088,7 +7088,7 @@ dissect_amqp_0_9_method_access_request(tvbuff_t *tvb,
{
/* realm (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_access_request_realm,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* exclusive (bit) */
@@ -7150,7 +7150,7 @@ dissect_amqp_0_9_method_exchange_declare(tvbuff_t *tvb, packet_info *pinfo,
/* type (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_exchange_declare_type,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* passive (bit) */
@@ -7615,7 +7615,7 @@ dissect_amqp_0_9_method_basic_consume(tvbuff_t *tvb, packet_info *pinfo,
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_consume_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* no-local (bit) */
@@ -7653,7 +7653,7 @@ dissect_amqp_0_9_method_basic_consume_ok(tvbuff_t *tvb,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_consume_ok_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7667,7 +7667,7 @@ dissect_amqp_0_9_method_basic_cancel(tvbuff_t *tvb,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_cancel_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* nowait (bit) */
@@ -7685,7 +7685,7 @@ dissect_amqp_0_9_method_basic_cancel_ok(tvbuff_t *tvb,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_cancel_ok_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7767,17 +7767,17 @@ dissect_amqp_0_9_method_basic_return(tvbuff_t *tvb, packet_info *pinfo,
/* reply-text (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_return_reply_text,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_return_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_return_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -7794,7 +7794,7 @@ dissect_amqp_0_9_method_basic_deliver(guint16 channel_num,
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_deliver_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* delivery-tag (longlong) */
@@ -7903,7 +7903,7 @@ dissect_amqp_0_9_method_basic_get_empty(tvbuff_t *tvb,
{
/* cluster-id (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_basic_get_empty_cluster_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8071,12 +8071,12 @@ dissect_amqp_0_9_method_file_consume(tvbuff_t *tvb, packet_info *pinfo,
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_consume_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_consume_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* no-local (bit) */
@@ -8114,7 +8114,7 @@ dissect_amqp_0_9_method_file_consume_ok(tvbuff_t *tvb,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_consume_ok_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8128,7 +8128,7 @@ dissect_amqp_0_9_method_file_cancel(tvbuff_t *tvb,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_cancel_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* nowait (bit) */
@@ -8146,7 +8146,7 @@ dissect_amqp_0_9_method_file_cancel_ok(tvbuff_t *tvb,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_cancel_ok_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8160,7 +8160,7 @@ dissect_amqp_0_9_method_file_open(tvbuff_t *tvb,
{
/* identifier (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_open_identifier,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* content-size (longlong) */
@@ -8207,12 +8207,12 @@ dissect_amqp_0_9_method_file_publish(tvbuff_t *tvb,
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_publish_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_publish_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* mandatory (bit) */
@@ -8226,7 +8226,7 @@ dissect_amqp_0_9_method_file_publish(tvbuff_t *tvb,
offset += 1;
/* identifier (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_publish_identifier,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8245,17 +8245,17 @@ dissect_amqp_0_9_method_file_return(tvbuff_t *tvb,
/* reply-text (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_return_reply_text,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_return_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_return_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8269,7 +8269,7 @@ dissect_amqp_0_9_method_file_deliver(tvbuff_t *tvb,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_deliver_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* delivery-tag (longlong) */
@@ -8284,17 +8284,17 @@ dissect_amqp_0_9_method_file_deliver(tvbuff_t *tvb,
offset += 1;
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_deliver_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_deliver_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* identifier (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_file_deliver_identifier,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8388,12 +8388,12 @@ dissect_amqp_0_9_method_stream_consume(tvbuff_t *tvb, packet_info *pinfo,
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_consume_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_consume_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* no-local (bit) */
@@ -8427,7 +8427,7 @@ dissect_amqp_0_9_method_stream_consume_ok(tvbuff_t *tvb,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_consume_ok_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8441,7 +8441,7 @@ dissect_amqp_0_9_method_stream_cancel(tvbuff_t *tvb,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_cancel_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* nowait (bit) */
@@ -8459,7 +8459,7 @@ dissect_amqp_0_9_method_stream_cancel_ok(tvbuff_t *tvb,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_cancel_ok_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8478,12 +8478,12 @@ dissect_amqp_0_9_method_stream_publish(tvbuff_t *tvb,
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_publish_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_publish_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* mandatory (bit) */
@@ -8510,17 +8510,17 @@ dissect_amqp_0_9_method_stream_return(tvbuff_t *tvb,
/* reply-text (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_return_reply_text,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_return_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* routing-key (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_return_routing_key,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8534,7 +8534,7 @@ dissect_amqp_0_9_method_stream_deliver(tvbuff_t *tvb,
{
/* consumer-tag (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_deliver_consumer_tag,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* delivery-tag (longlong) */
@@ -8544,12 +8544,12 @@ dissect_amqp_0_9_method_stream_deliver(tvbuff_t *tvb,
/* exchange (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_deliver_exchange,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
/* queue (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_stream_deliver_queue,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8635,7 +8635,7 @@ dissect_amqp_0_9_method_dtx_start(tvbuff_t *tvb,
{
/* dtx-identifier (shortstr) */
proto_tree_add_item(args_tree, hf_amqp_method_dtx_start_dtx_identifier,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
return offset;
@@ -8727,7 +8727,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* content-encoding (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_content_encoding,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
eh_ptr->encoding = ascii_strdown_inplace(
tvb_get_string_enc(wmem_file_scope(), tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII));
@@ -8765,7 +8765,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* correlation-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_correlation_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8773,7 +8773,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* reply-to (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_reply_to,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8781,7 +8781,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* expiration (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_expiration,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8789,7 +8789,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* message-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_message_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8807,7 +8807,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* type (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_type,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8815,7 +8815,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* user-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_user_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8823,7 +8823,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* app-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_app_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8831,7 +8831,7 @@ dissect_amqp_0_9_content_header_basic(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* cluster-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_basic_cluster_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
/*prop_flags <<= 1;*/
@@ -8863,7 +8863,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* content-encoding (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_file_content_encoding,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8888,7 +8888,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* reply-to (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_file_reply_to,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8896,7 +8896,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* message-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_file_message_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8904,7 +8904,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* filename (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_file_filename,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -8922,7 +8922,7 @@ dissect_amqp_0_9_content_header_file(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* cluster-id (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_file_cluster_id,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
/*prop_flags <<= 1;*/
@@ -8954,7 +8954,7 @@ dissect_amqp_0_9_content_header_stream(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* content-encoding (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_stream_content_encoding,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -9012,7 +9012,7 @@ dissect_amqp_0_9_content_header_tunnel(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* proxy-name (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_tunnel_proxy_name,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -9020,7 +9020,7 @@ dissect_amqp_0_9_content_header_tunnel(tvbuff_t *tvb, packet_info *pinfo,
if (prop_flags & 0x8000) {
/* data-name (shortstr) */
proto_tree_add_item(prop_tree, hf_amqp_header_tunnel_data_name,
- tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII|ENC_NA);
+ tvb, offset + 1, tvb_get_guint8(tvb, offset), ENC_ASCII);
offset += 1 + tvb_get_guint8(tvb, offset);
}
prop_flags <<= 1;
@@ -9073,7 +9073,7 @@ dissect_amqp_0_9_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
if (tree) {
ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, ENC_NA);
amqp_tree = proto_item_add_subtree(ti, ett_amqp_init);
- proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(amqp_tree, hf_amqp_init_protocol, tvb, 0, 4, ENC_ASCII);
proto_tree_add_item(amqp_tree, hf_amqp_init_id_major, tvb, 4, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(amqp_tree, hf_amqp_init_id_minor, tvb, 5, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(amqp_tree, hf_amqp_init_version_major, tvb, 6, 1, ENC_BIG_ENDIAN);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 08:40:14 +0000