diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-23 21:46:31 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-23 21:46:31 +0000 |
| commit | 0ff5638f37a1de5d061106b37930c6767bc445de (patch) | |
| tree | 8fe06c6ee8fe5365b0a2eaa3708fb6d431ca59cb | |
| parent | e84f210167f604a4c40e42774ebd1e80c1a23711 (diff) | |
Replace blurbs that match the name (case insensitive) with NULL.
svn path=/trunk/; revision=34227
82 files changed, 1109 insertions, 1109 deletions
diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index 06fbbc13f2..650df40ffa 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -144,7 +144,7 @@ void proto_register_cms(void) { { &hf_cms_ci_contentType, { "contentType", "cms.contentInfo.contentType", FT_OID, BASE_NONE, NULL, 0, - "ContentType", HFILL }}, + NULL, HFILL }}, #include "packet-cms-hfarr.c" }; @@ -160,8 +160,8 @@ void proto_register_cms(void) { proto_register_field_array(proto_cms, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU); - register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU); + register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU); + register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU); register_ber_oid_syntax(".p7s", NULL, "ContentInfo"); register_ber_oid_syntax(".p7m", NULL, "ContentInfo"); register_ber_oid_syntax(".p7c", NULL, "ContentInfo"); diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index 4c0732ca08..bd4717d88d 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -3985,7 +3985,7 @@ dissect_spotlight(tvbuff_t *tvb, proto_tree *tree, gint offset) tvb, offset, 8, - "Endianess: %s", + "Endianess: %s", spotlight_endianess == SPOTLIGHT_BIG_ENDIAN ? "Big Endian" : "Litte Endian"); offset += 8; @@ -4043,13 +4043,13 @@ dissect_spotlight(tvbuff_t *tvb, proto_tree *tree, gint offset) /* tree per query */ sub_tree_query = proto_item_add_subtree(item_query, ett_afp_spotlight_query_line); query_data64 = spotlight_ntoh64(tvb, offset + query_offset); - + /* print the query line */ proto_tree_add_text(sub_tree_query, tvb, offset + query_offset, 8, - "Index: %" G_GINT64_MODIFIER "u, ?: 0x%08" G_GINT64_MODIFIER "x", + "Index: %" G_GINT64_MODIFIER "u, ?: 0x%08" G_GINT64_MODIFIER "x", query_data64 >> 32, query_data64 & 0xffffffff); @@ -4172,10 +4172,10 @@ dissect_query_afp_spotlight(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t break; case SPOTLIGHT_CMD_GET_THREE: - proto_tree_add_item(tree, hf_afp_spotlight_volflags, tvb, offset, 4,FALSE); + proto_tree_add_item(tree, hf_afp_spotlight_volflags, tvb, offset, 4,FALSE); offset += 4; - proto_tree_add_item(tree, hf_afp_spotlight_reqlen, tvb, offset, 4,FALSE); + proto_tree_add_item(tree, hf_afp_spotlight_reqlen, tvb, offset, 4,FALSE); offset += 4; offset = dissect_spotlight(tvb, tree, offset); @@ -4375,12 +4375,12 @@ dissect_reply_afp_spotlight(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t break; case SPOTLIGHT_CMD_GET_VOLID: - proto_tree_add_item(tree, hf_afp_spotlight_volflags, tvb, offset, 4,FALSE); + proto_tree_add_item(tree, hf_afp_spotlight_volflags, tvb, offset, 4,FALSE); offset += 4; break; case SPOTLIGHT_CMD_GET_THREE: - proto_tree_add_item(tree, hf_afp_spotlight_returncode, tvb, offset, 4,FALSE); + proto_tree_add_item(tree, hf_afp_spotlight_returncode, tvb, offset, 4,FALSE); offset += 4; offset = dissect_spotlight(tvb, tree, offset); @@ -4424,7 +4424,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) request_val = se_alloc(sizeof(afp_request_val)); request_val->command = afp_command; - + if (afp_command == AFP_SPOTLIGHTRPC) request_val->spotlight_req_command = tvb_get_ntohl(tvb, offset + 2 + 2 + 4); else @@ -6224,27 +6224,27 @@ proto_register_afp(void) { &hf_afp_spotlight_returncode, { "Return code", "afp.spotlight.return", FT_INT32, BASE_DEC, NULL, 0x0, - "Return code", HFILL }}, + NULL, HFILL }}, { &hf_afp_spotlight_volflags, { "Volume flags", "afp.spotlight.volflags", FT_UINT32, BASE_HEX, NULL, 0x0, - "Volume flags", HFILL }}, + NULL, HFILL }}, { &hf_afp_spotlight_reqlen, { "Length", "afp.spotlight.reqlen", FT_UINT32, BASE_DEC, NULL, 0x0, - "Length", HFILL }}, + NULL, HFILL }}, { &hf_afp_spotlight_toc_query_end, { "End marker", "afp.spotlight.query_end", FT_UINT32, BASE_HEX, NULL, 0x0, - "End marker", HFILL }}, + NULL, HFILL }}, { &hf_afp_spotlight_mdstring, { "mdquery string", "afp.spotlight.mds", FT_STRINGZ, BASE_NONE, NULL, 0x0, - "mdquery string", HFILL }}, + NULL, HFILL }}, { &hf_afp_unknown, { "Unknown parameter", "afp.unknown", diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index 675dda0106..ca718fbd5a 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -3239,7 +3239,7 @@ proto_register_afs(void) { &hf_afs_bos_cmd, { "Command", "afs.bos.cmd", FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }}, { &hf_afs_bos_key, { "Key", "afs.bos.key", - FT_BYTES, BASE_NONE, 0, 0, "key", HFILL }}, + FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }}, { &hf_afs_bos_user, { "User", "afs.bos.user", FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }}, { &hf_afs_bos_instance, { "Instance", "afs.bos.instance", diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c index 64e0c3f5be..65e69d9c56 100644 --- a/epan/dissectors/packet-ajp13.c +++ b/epan/dissectors/packet-ajp13.c @@ -813,7 +813,7 @@ proto_register_ajp13(void) HFILL } }, { &hf_ajp13_port, - { "PORT", "ajp13.port", FT_UINT16, BASE_DEC, NULL, 0x0, "Port", + { "PORT", "ajp13.port", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ajp13_sslp, diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index f1898ab205..4e901e5345 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -1037,19 +1037,19 @@ dissect_amqp_field_table(tvbuff_t *tvb, int offset, int bound, int length, proto typename = "integer"; value = ep_strdup_printf("%d", tvb_get_ntohl(tvb, offset)); AMQP_INCREMENT(offset, 4, bound); - length -= 4; + length -= 4; break; case 'D': typename = "decimal"; value = "..."; AMQP_INCREMENT(offset, 5, bound); - length -= 5; + length -= 5; break; case 'T': typename = "timestamp"; value = "..."; AMQP_INCREMENT(offset, 8, bound); - length -= 8; + length -= 8; break; case 'F': /* TODO: make it recursive here */ @@ -1114,7 +1114,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } - + ti = proto_tree_add_item(tree, proto_amqp, tvb, 0, -1, FALSE); amqp_tree = proto_item_add_subtree(ti, ett_amqp); proto_tree_add_item(amqp_tree, hf_amqp_type, tvb, 0, 1, FALSE); @@ -1128,7 +1128,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (tvb_get_ntohs(tvb, 7)) { case AMQP_CLASS_CONNECTION: proto_tree_add_item(amqp_tree, hf_amqp_method_connection_method_id, - tvb, 9, 2, FALSE); + tvb, 9, 2, FALSE); ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, FALSE); args_tree = proto_item_add_subtree(ti, ett_args); @@ -1238,7 +1238,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case AMQP_CLASS_CHANNEL: proto_tree_add_item(amqp_tree, hf_amqp_method_channel_method_id, - tvb, 9, 2, FALSE); + tvb, 9, 2, FALSE); ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, FALSE); args_tree = proto_item_add_subtree(ti, ett_args); @@ -1339,7 +1339,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case AMQP_CLASS_ACCESS: proto_tree_add_item(amqp_tree, hf_amqp_method_access_method_id, - tvb, 9, 2, FALSE); + tvb, 9, 2, FALSE); ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, FALSE); args_tree = proto_item_add_subtree(ti, ett_args); @@ -1368,7 +1368,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case AMQP_CLASS_EXCHANGE: proto_tree_add_item(amqp_tree, hf_amqp_method_exchange_method_id, - tvb, 9, 2, FALSE); + tvb, 9, 2, FALSE); ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, FALSE); args_tree = proto_item_add_subtree(ti, ett_args); @@ -1415,7 +1415,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case AMQP_CLASS_QUEUE: proto_tree_add_item(amqp_tree, hf_amqp_method_queue_method_id, - tvb, 9, 2, FALSE); + tvb, 9, 2, FALSE); ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, FALSE); args_tree = proto_item_add_subtree(ti, ett_args); @@ -1516,7 +1516,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case AMQP_CLASS_BASIC: proto_tree_add_item(amqp_tree, hf_amqp_method_basic_method_id, - tvb, 9, 2, FALSE); + tvb, 9, 2, FALSE); ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, FALSE); args_tree = proto_item_add_subtree(ti, ett_args); @@ -1662,7 +1662,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case AMQP_CLASS_FILE: proto_tree_add_item(amqp_tree, hf_amqp_method_file_method_id, - tvb, 9, 2, FALSE); + tvb, 9, 2, FALSE); ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, FALSE); args_tree = proto_item_add_subtree(ti, ett_args); @@ -1799,7 +1799,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case AMQP_CLASS_STREAM: proto_tree_add_item(amqp_tree, hf_amqp_method_stream_method_id, - tvb, 9, 2, FALSE); + tvb, 9, 2, FALSE); ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, FALSE); args_tree = proto_item_add_subtree(ti, ett_args); @@ -1891,7 +1891,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case AMQP_CLASS_TX: proto_tree_add_item(amqp_tree, hf_amqp_method_tx_method_id, - tvb, 9, 2, FALSE); + tvb, 9, 2, FALSE); ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, FALSE); args_tree = proto_item_add_subtree(ti, ett_args); @@ -1956,7 +1956,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case AMQP_CLASS_DTX: proto_tree_add_item(amqp_tree, hf_amqp_method_dtx_method_id, - tvb, 9, 2, FALSE); + tvb, 9, 2, FALSE); ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, FALSE); args_tree = proto_item_add_subtree(ti, ett_args); @@ -2003,7 +2003,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case AMQP_CLASS_TUNNEL: proto_tree_add_item(amqp_tree, hf_amqp_method_tunnel_method_id, - tvb, 9, 2, FALSE); + tvb, 9, 2, FALSE); ti = proto_tree_add_item(amqp_tree, hf_amqp_method_arguments, tvb, 11, length - 4, FALSE); args_tree = proto_item_add_subtree(ti, ett_args); @@ -4255,11 +4255,11 @@ proto_register_amqp(void) {&hf_amqp_method_connection_start_mechanisms, { "Mechanisms", "amqp.method.arguments.mechanisms", FT_BYTES, BASE_NONE, NULL, 0, - "mechanisms", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_connection_start_locales, { "Locales", "amqp.method.arguments.locales", FT_BYTES, BASE_NONE, NULL, 0, - "locales", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_connection_start_ok_client_properties, { "Client-Properties", "amqp.method.arguments.client_properties", FT_NONE, BASE_NONE, NULL, 0, @@ -4267,23 +4267,23 @@ proto_register_amqp(void) {&hf_amqp_method_connection_start_ok_mechanism, { "Mechanism", "amqp.method.arguments.mechanism", FT_STRING, BASE_NONE, NULL, 0, - "mechanism", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_connection_start_ok_response, { "Response", "amqp.method.arguments.response", FT_BYTES, BASE_NONE, NULL, 0, - "response", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_connection_start_ok_locale, { "Locale", "amqp.method.arguments.locale", FT_STRING, BASE_NONE, NULL, 0, - "locale", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_connection_secure_challenge, { "Challenge", "amqp.method.arguments.challenge", FT_BYTES, BASE_NONE, NULL, 0, - "challenge", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_connection_secure_ok_response, { "Response", "amqp.method.arguments.response", FT_BYTES, BASE_NONE, NULL, 0, - "response", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_connection_tune_channel_max, { "Channel-Max", "amqp.method.arguments.channel_max", FT_UINT16, BASE_DEC, NULL, 0, @@ -4295,7 +4295,7 @@ proto_register_amqp(void) {&hf_amqp_method_connection_tune_heartbeat, { "Heartbeat", "amqp.method.arguments.heartbeat", FT_UINT16, BASE_DEC, NULL, 0, - "heartbeat", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_connection_tune_ok_channel_max, { "Channel-Max", "amqp.method.arguments.channel_max", FT_UINT16, BASE_DEC, NULL, 0, @@ -4307,7 +4307,7 @@ proto_register_amqp(void) {&hf_amqp_method_connection_tune_ok_heartbeat, { "Heartbeat", "amqp.method.arguments.heartbeat", FT_UINT16, BASE_DEC, NULL, 0, - "heartbeat", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_connection_open_virtual_host, { "Virtual-Host", "amqp.method.arguments.virtual_host", FT_STRING, BASE_NONE, NULL, 0, @@ -4315,11 +4315,11 @@ proto_register_amqp(void) {&hf_amqp_method_connection_open_capabilities, { "Capabilities", "amqp.method.arguments.capabilities", FT_STRING, BASE_NONE, NULL, 0, - "capabilities", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_connection_open_insist, { "Insist", "amqp.method.arguments.insist", FT_BOOLEAN, 8, NULL, 0x01, - "insist", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_connection_open_ok_known_hosts, { "Known-Hosts", "amqp.method.arguments.known_hosts", FT_STRING, BASE_NONE, NULL, 0, @@ -4327,7 +4327,7 @@ proto_register_amqp(void) {&hf_amqp_method_connection_redirect_host, { "Host", "amqp.method.arguments.host", FT_STRING, BASE_NONE, NULL, 0, - "host", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_connection_redirect_known_hosts, { "Known-Hosts", "amqp.method.arguments.known_hosts", FT_STRING, BASE_NONE, NULL, 0, @@ -4359,11 +4359,11 @@ proto_register_amqp(void) {&hf_amqp_method_channel_flow_active, { "Active", "amqp.method.arguments.active", FT_BOOLEAN, 8, NULL, 0x01, - "active", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_channel_flow_ok_active, { "Active", "amqp.method.arguments.active", FT_BOOLEAN, 8, NULL, 0x01, - "active", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_channel_close_reply_code, { "Reply-Code", "amqp.method.arguments.reply_code", FT_UINT16, BASE_DEC, NULL, 0, @@ -4387,51 +4387,51 @@ proto_register_amqp(void) {&hf_amqp_method_access_request_realm, { "Realm", "amqp.method.arguments.realm", FT_STRING, BASE_NONE, NULL, 0, - "realm", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_access_request_exclusive, { "Exclusive", "amqp.method.arguments.exclusive", FT_BOOLEAN, 8, NULL, 0x01, - "exclusive", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_access_request_passive, { "Passive", "amqp.method.arguments.passive", FT_BOOLEAN, 8, NULL, 0x02, - "passive", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_access_request_active, { "Active", "amqp.method.arguments.active", FT_BOOLEAN, 8, NULL, 0x04, - "active", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_access_request_write, { "Write", "amqp.method.arguments.write", FT_BOOLEAN, 8, NULL, 0x08, - "write", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_access_request_read, { "Read", "amqp.method.arguments.read", FT_BOOLEAN, 8, NULL, 0x10, - "read", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_access_request_ok_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_exchange_declare_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_exchange_declare_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_exchange_declare_type, { "Type", "amqp.method.arguments.type", FT_STRING, BASE_NONE, NULL, 0, - "type", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_exchange_declare_passive, { "Passive", "amqp.method.arguments.passive", FT_BOOLEAN, 8, NULL, 0x01, - "passive", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_exchange_declare_durable, { "Durable", "amqp.method.arguments.durable", FT_BOOLEAN, 8, NULL, 0x02, - "durable", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_exchange_declare_auto_delete, { "Auto-Delete", "amqp.method.arguments.auto_delete", FT_BOOLEAN, 8, NULL, 0x04, @@ -4439,23 +4439,23 @@ proto_register_amqp(void) {&hf_amqp_method_exchange_declare_internal, { "Internal", "amqp.method.arguments.internal", FT_BOOLEAN, 8, NULL, 0x08, - "internal", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_exchange_declare_nowait, { "Nowait", "amqp.method.arguments.nowait", FT_BOOLEAN, 8, NULL, 0x10, - "nowait", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_exchange_declare_arguments, { "Arguments", "amqp.method.arguments.arguments", FT_NONE, BASE_NONE, NULL, 0, - "arguments", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_exchange_delete_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_exchange_delete_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_exchange_delete_if_unused, { "If-Unused", "amqp.method.arguments.if_unused", FT_BOOLEAN, 8, NULL, 0x01, @@ -4463,27 +4463,27 @@ proto_register_amqp(void) {&hf_amqp_method_exchange_delete_nowait, { "Nowait", "amqp.method.arguments.nowait", FT_BOOLEAN, 8, NULL, 0x02, - "nowait", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_declare_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_declare_queue, { "Queue", "amqp.method.arguments.queue", FT_STRING, BASE_NONE, NULL, 0, - "queue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_declare_passive, { "Passive", "amqp.method.arguments.passive", FT_BOOLEAN, 8, NULL, 0x01, - "passive", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_declare_durable, { "Durable", "amqp.method.arguments.durable", FT_BOOLEAN, 8, NULL, 0x02, - "durable", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_declare_exclusive, { "Exclusive", "amqp.method.arguments.exclusive", FT_BOOLEAN, 8, NULL, 0x04, - "exclusive", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_declare_auto_delete, { "Auto-Delete", "amqp.method.arguments.auto_delete", FT_BOOLEAN, 8, NULL, 0x08, @@ -4491,15 +4491,15 @@ proto_register_amqp(void) {&hf_amqp_method_queue_declare_nowait, { "Nowait", "amqp.method.arguments.nowait", FT_BOOLEAN, 8, NULL, 0x10, - "nowait", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_declare_arguments, { "Arguments", "amqp.method.arguments.arguments", FT_NONE, BASE_NONE, NULL, 0, - "arguments", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_declare_ok_queue, { "Queue", "amqp.method.arguments.queue", FT_STRING, BASE_NONE, NULL, 0, - "queue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_declare_ok_message_count, { "Message-Count", "amqp.method.arguments.message_count", FT_UINT32, BASE_DEC, NULL, 0, @@ -4511,15 +4511,15 @@ proto_register_amqp(void) {&hf_amqp_method_queue_bind_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_bind_queue, { "Queue", "amqp.method.arguments.queue", FT_STRING, BASE_NONE, NULL, 0, - "queue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_bind_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_bind_routing_key, { "Routing-Key", "amqp.method.arguments.routing_key", FT_STRING, BASE_NONE, NULL, 0, @@ -4527,23 +4527,23 @@ proto_register_amqp(void) {&hf_amqp_method_queue_bind_nowait, { "Nowait", "amqp.method.arguments.nowait", FT_BOOLEAN, 8, NULL, 0x01, - "nowait", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_bind_arguments, { "Arguments", "amqp.method.arguments.arguments", FT_NONE, BASE_NONE, NULL, 0, - "arguments", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_unbind_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_unbind_queue, { "Queue", "amqp.method.arguments.queue", FT_STRING, BASE_NONE, NULL, 0, - "queue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_unbind_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_unbind_routing_key, { "Routing-Key", "amqp.method.arguments.routing_key", FT_STRING, BASE_NONE, NULL, 0, @@ -4551,19 +4551,19 @@ proto_register_amqp(void) {&hf_amqp_method_queue_unbind_arguments, { "Arguments", "amqp.method.arguments.arguments", FT_NONE, BASE_NONE, NULL, 0, - "arguments", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_purge_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_purge_queue, { "Queue", "amqp.method.arguments.queue", FT_STRING, BASE_NONE, NULL, 0, - "queue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_purge_nowait, { "Nowait", "amqp.method.arguments.nowait", FT_BOOLEAN, 8, NULL, 0x01, - "nowait", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_purge_ok_message_count, { "Message-Count", "amqp.method.arguments.message_count", FT_UINT32, BASE_DEC, NULL, 0, @@ -4571,11 +4571,11 @@ proto_register_amqp(void) {&hf_amqp_method_queue_delete_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_delete_queue, { "Queue", "amqp.method.arguments.queue", FT_STRING, BASE_NONE, NULL, 0, - "queue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_delete_if_unused, { "If-Unused", "amqp.method.arguments.if_unused", FT_BOOLEAN, 8, NULL, 0x01, @@ -4587,7 +4587,7 @@ proto_register_amqp(void) {&hf_amqp_method_queue_delete_nowait, { "Nowait", "amqp.method.arguments.nowait", FT_BOOLEAN, 8, NULL, 0x04, - "nowait", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_queue_delete_ok_message_count, { "Message-Count", "amqp.method.arguments.message_count", FT_UINT32, BASE_DEC, NULL, 0, @@ -4603,15 +4603,15 @@ proto_register_amqp(void) {&hf_amqp_method_basic_qos_global, { "Global", "amqp.method.arguments.global", FT_BOOLEAN, 8, NULL, 0x01, - "global", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_consume_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_consume_queue, { "Queue", "amqp.method.arguments.queue", FT_STRING, BASE_NONE, NULL, 0, - "queue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_consume_consumer_tag, { "Consumer-Tag", "amqp.method.arguments.consumer_tag", FT_STRING, BASE_NONE, NULL, 0, @@ -4627,15 +4627,15 @@ proto_register_amqp(void) {&hf_amqp_method_basic_consume_exclusive, { "Exclusive", "amqp.method.arguments.exclusive", FT_BOOLEAN, 8, NULL, 0x04, - "exclusive", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_consume_nowait, { "Nowait", "amqp.method.arguments.nowait", FT_BOOLEAN, 8, NULL, 0x08, - "nowait", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_consume_filter, { "Filter", "amqp.method.arguments.filter", FT_NONE, BASE_NONE, NULL, 0, - "filter", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_consume_ok_consumer_tag, { "Consumer-Tag", "amqp.method.arguments.consumer_tag", FT_STRING, BASE_NONE, NULL, 0, @@ -4647,7 +4647,7 @@ proto_register_amqp(void) {&hf_amqp_method_basic_cancel_nowait, { "Nowait", "amqp.method.arguments.nowait", FT_BOOLEAN, 8, NULL, 0x01, - "nowait", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_cancel_ok_consumer_tag, { "Consumer-Tag", "amqp.method.arguments.consumer_tag", FT_STRING, BASE_NONE, NULL, 0, @@ -4655,11 +4655,11 @@ proto_register_amqp(void) {&hf_amqp_method_basic_publish_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_publish_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_publish_routing_key, { "Routing-Key", "amqp.method.arguments.routing_key", FT_STRING, BASE_NONE, NULL, 0, @@ -4667,11 +4667,11 @@ proto_register_amqp(void) {&hf_amqp_method_basic_publish_mandatory, { "Mandatory", "amqp.method.arguments.mandatory", FT_BOOLEAN, 8, NULL, 0x01, - "mandatory", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_publish_immediate, { "Immediate", "amqp.method.arguments.immediate", FT_BOOLEAN, 8, NULL, 0x02, - "immediate", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_return_reply_code, { "Reply-Code", "amqp.method.arguments.reply_code", FT_UINT16, BASE_DEC, NULL, 0, @@ -4683,7 +4683,7 @@ proto_register_amqp(void) {&hf_amqp_method_basic_return_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_return_routing_key, { "Routing-Key", "amqp.method.arguments.routing_key", FT_STRING, BASE_NONE, NULL, 0, @@ -4699,11 +4699,11 @@ proto_register_amqp(void) {&hf_amqp_method_basic_deliver_redelivered, { "Redelivered", "amqp.method.arguments.redelivered", FT_BOOLEAN, 8, NULL, 0x01, - "redelivered", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_deliver_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_deliver_routing_key, { "Routing-Key", "amqp.method.arguments.routing_key", FT_STRING, BASE_NONE, NULL, 0, @@ -4711,11 +4711,11 @@ proto_register_amqp(void) {&hf_amqp_method_basic_get_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_get_queue, { "Queue", "amqp.method.arguments.queue", FT_STRING, BASE_NONE, NULL, 0, - "queue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_get_no_ack, { "No-Ack", "amqp.method.arguments.no_ack", FT_BOOLEAN, 8, NULL, 0x01, @@ -4727,11 +4727,11 @@ proto_register_amqp(void) {&hf_amqp_method_basic_get_ok_redelivered, { "Redelivered", "amqp.method.arguments.redelivered", FT_BOOLEAN, 8, NULL, 0x01, - "redelivered", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_get_ok_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_get_ok_routing_key, { "Routing-Key", "amqp.method.arguments.routing_key", FT_STRING, BASE_NONE, NULL, 0, @@ -4751,7 +4751,7 @@ proto_register_amqp(void) {&hf_amqp_method_basic_ack_multiple, { "Multiple", "amqp.method.arguments.multiple", FT_BOOLEAN, 8, NULL, 0x01, - "multiple", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_reject_delivery_tag, { "Delivery-Tag", "amqp.method.arguments.delivery_tag", FT_UINT64, BASE_DEC, NULL, 0, @@ -4759,11 +4759,11 @@ proto_register_amqp(void) {&hf_amqp_method_basic_reject_requeue, { "Requeue", "amqp.method.arguments.requeue", FT_BOOLEAN, 8, NULL, 0x01, - "requeue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_basic_recover_requeue, { "Requeue", "amqp.method.arguments.requeue", FT_BOOLEAN, 8, NULL, 0x01, - "requeue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_qos_prefetch_size, { "Prefetch-Size", "amqp.method.arguments.prefetch_size", FT_UINT32, BASE_DEC, NULL, 0, @@ -4775,15 +4775,15 @@ proto_register_amqp(void) {&hf_amqp_method_file_qos_global, { "Global", "amqp.method.arguments.global", FT_BOOLEAN, 8, NULL, 0x01, - "global", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_consume_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_consume_queue, { "Queue", "amqp.method.arguments.queue", FT_STRING, BASE_NONE, NULL, 0, - "queue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_consume_consumer_tag, { "Consumer-Tag", "amqp.method.arguments.consumer_tag", FT_STRING, BASE_NONE, NULL, 0, @@ -4799,15 +4799,15 @@ proto_register_amqp(void) {&hf_amqp_method_file_consume_exclusive, { "Exclusive", "amqp.method.arguments.exclusive", FT_BOOLEAN, 8, NULL, 0x04, - "exclusive", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_consume_nowait, { "Nowait", "amqp.method.arguments.nowait", FT_BOOLEAN, 8, NULL, 0x08, - "nowait", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_consume_filter, { "Filter", "amqp.method.arguments.filter", FT_NONE, BASE_NONE, NULL, 0, - "filter", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_consume_ok_consumer_tag, { "Consumer-Tag", "amqp.method.arguments.consumer_tag", FT_STRING, BASE_NONE, NULL, 0, @@ -4819,7 +4819,7 @@ proto_register_amqp(void) {&hf_amqp_method_file_cancel_nowait, { "Nowait", "amqp.method.arguments.nowait", FT_BOOLEAN, 8, NULL, 0x01, - "nowait", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_cancel_ok_consumer_tag, { "Consumer-Tag", "amqp.method.arguments.consumer_tag", FT_STRING, BASE_NONE, NULL, 0, @@ -4827,7 +4827,7 @@ proto_register_amqp(void) {&hf_amqp_method_file_open_identifier, { "Identifier", "amqp.method.arguments.identifier", FT_STRING, BASE_NONE, NULL, 0, - "identifier", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_open_content_size, { "Content-Size", "amqp.method.arguments.content_size", FT_UINT64, BASE_DEC, NULL, 0, @@ -4839,11 +4839,11 @@ proto_register_amqp(void) {&hf_amqp_method_file_publish_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_publish_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_publish_routing_key, { "Routing-Key", "amqp.method.arguments.routing_key", FT_STRING, BASE_NONE, NULL, 0, @@ -4851,15 +4851,15 @@ proto_register_amqp(void) {&hf_amqp_method_file_publish_mandatory, { "Mandatory", "amqp.method.arguments.mandatory", FT_BOOLEAN, 8, NULL, 0x01, - "mandatory", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_publish_immediate, { "Immediate", "amqp.method.arguments.immediate", FT_BOOLEAN, 8, NULL, 0x02, - "immediate", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_publish_identifier, { "Identifier", "amqp.method.arguments.identifier", FT_STRING, BASE_NONE, NULL, 0, - "identifier", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_return_reply_code, { "Reply-Code", "amqp.method.arguments.reply_code", FT_UINT16, BASE_DEC, NULL, 0, @@ -4871,7 +4871,7 @@ proto_register_amqp(void) {&hf_amqp_method_file_return_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_return_routing_key, { "Routing-Key", "amqp.method.arguments.routing_key", FT_STRING, BASE_NONE, NULL, 0, @@ -4887,11 +4887,11 @@ proto_register_amqp(void) {&hf_amqp_method_file_deliver_redelivered, { "Redelivered", "amqp.method.arguments.redelivered", FT_BOOLEAN, 8, NULL, 0x01, - "redelivered", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_deliver_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_deliver_routing_key, { "Routing-Key", "amqp.method.arguments.routing_key", FT_STRING, BASE_NONE, NULL, 0, @@ -4899,7 +4899,7 @@ proto_register_amqp(void) {&hf_amqp_method_file_deliver_identifier, { "Identifier", "amqp.method.arguments.identifier", FT_STRING, BASE_NONE, NULL, 0, - "identifier", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_ack_delivery_tag, { "Delivery-Tag", "amqp.method.arguments.delivery_tag", FT_UINT64, BASE_DEC, NULL, 0, @@ -4907,7 +4907,7 @@ proto_register_amqp(void) {&hf_amqp_method_file_ack_multiple, { "Multiple", "amqp.method.arguments.multiple", FT_BOOLEAN, 8, NULL, 0x01, - "multiple", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_file_reject_delivery_tag, { "Delivery-Tag", "amqp.method.arguments.delivery_tag", FT_UINT64, BASE_DEC, NULL, 0, @@ -4915,7 +4915,7 @@ proto_register_amqp(void) {&hf_amqp_method_file_reject_requeue, { "Requeue", "amqp.method.arguments.requeue", FT_BOOLEAN, 8, NULL, 0x01, - "requeue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_qos_prefetch_size, { "Prefetch-Size", "amqp.method.arguments.prefetch_size", FT_UINT32, BASE_DEC, NULL, 0, @@ -4931,15 +4931,15 @@ proto_register_amqp(void) {&hf_amqp_method_stream_qos_global, { "Global", "amqp.method.arguments.global", FT_BOOLEAN, 8, NULL, 0x01, - "global", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_consume_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_consume_queue, { "Queue", "amqp.method.arguments.queue", FT_STRING, BASE_NONE, NULL, 0, - "queue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_consume_consumer_tag, { "Consumer-Tag", "amqp.method.arguments.consumer_tag", FT_STRING, BASE_NONE, NULL, 0, @@ -4951,15 +4951,15 @@ proto_register_amqp(void) {&hf_amqp_method_stream_consume_exclusive, { "Exclusive", "amqp.method.arguments.exclusive", FT_BOOLEAN, 8, NULL, 0x02, - "exclusive", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_consume_nowait, { "Nowait", "amqp.method.arguments.nowait", FT_BOOLEAN, 8, NULL, 0x04, - "nowait", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_consume_filter, { "Filter", "amqp.method.arguments.filter", FT_NONE, BASE_NONE, NULL, 0, - "filter", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_consume_ok_consumer_tag, { "Consumer-Tag", "amqp.method.arguments.consumer_tag", FT_STRING, BASE_NONE, NULL, 0, @@ -4971,7 +4971,7 @@ proto_register_amqp(void) {&hf_amqp_method_stream_cancel_nowait, { "Nowait", "amqp.method.arguments.nowait", FT_BOOLEAN, 8, NULL, 0x01, - "nowait", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_cancel_ok_consumer_tag, { "Consumer-Tag", "amqp.method.arguments.consumer_tag", FT_STRING, BASE_NONE, NULL, 0, @@ -4979,11 +4979,11 @@ proto_register_amqp(void) {&hf_amqp_method_stream_publish_ticket, { "Ticket", "amqp.method.arguments.ticket", FT_UINT16, BASE_DEC, NULL, 0, - "ticket", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_publish_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_publish_routing_key, { "Routing-Key", "amqp.method.arguments.routing_key", FT_STRING, BASE_NONE, NULL, 0, @@ -4991,11 +4991,11 @@ proto_register_amqp(void) {&hf_amqp_method_stream_publish_mandatory, { "Mandatory", "amqp.method.arguments.mandatory", FT_BOOLEAN, 8, NULL, 0x01, - "mandatory", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_publish_immediate, { "Immediate", "amqp.method.arguments.immediate", FT_BOOLEAN, 8, NULL, 0x02, - "immediate", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_return_reply_code, { "Reply-Code", "amqp.method.arguments.reply_code", FT_UINT16, BASE_DEC, NULL, 0, @@ -5007,7 +5007,7 @@ proto_register_amqp(void) {&hf_amqp_method_stream_return_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_return_routing_key, { "Routing-Key", "amqp.method.arguments.routing_key", FT_STRING, BASE_NONE, NULL, 0, @@ -5023,11 +5023,11 @@ proto_register_amqp(void) {&hf_amqp_method_stream_deliver_exchange, { "Exchange", "amqp.method.arguments.exchange", FT_STRING, BASE_NONE, NULL, 0, - "exchange", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_stream_deliver_queue, { "Queue", "amqp.method.arguments.queue", FT_STRING, BASE_NONE, NULL, 0, - "queue", HFILL}}, + NULL, HFILL}}, {&hf_amqp_method_dtx_start_dtx_identifier, { "Dtx-Identifier", "amqp.method.arguments.dtx_identifier", FT_STRING, BASE_NONE, NULL, 0, @@ -5071,7 +5071,7 @@ proto_register_amqp(void) {&hf_amqp_header_basic_headers, { "Headers", "amqp.method.properties.headers", FT_NONE, BASE_NONE, NULL, 0, - "headers", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_basic_delivery_mode, { "Delivery-Mode", "amqp.method.properties.delivery_mode", FT_UINT8, BASE_DEC, NULL, 0, @@ -5079,7 +5079,7 @@ proto_register_amqp(void) {&hf_amqp_header_basic_priority, { "Priority", "amqp.method.properties.priority", FT_UINT8, BASE_DEC, NULL, 0, - "priority", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_basic_correlation_id, { "Correlation-Id", "amqp.method.properties.correlation_id", FT_STRING, BASE_NONE, NULL, 0, @@ -5091,7 +5091,7 @@ proto_register_amqp(void) {&hf_amqp_header_basic_expiration, { "Expiration", "amqp.method.properties.expiration", FT_STRING, BASE_NONE, NULL, 0, - "expiration", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_basic_message_id, { "Message-Id", "amqp.method.properties.message_id", FT_STRING, BASE_NONE, NULL, 0, @@ -5099,11 +5099,11 @@ proto_register_amqp(void) {&hf_amqp_header_basic_timestamp, { "Timestamp", "amqp.method.properties.timestamp", FT_UINT64, BASE_DEC, NULL, 0, - "timestamp", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_basic_type, { "Type", "amqp.method.properties.type", FT_STRING, BASE_NONE, NULL, 0, - "type", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_basic_user_id, { "User-Id", "amqp.method.properties.user_id", FT_STRING, BASE_NONE, NULL, 0, @@ -5127,11 +5127,11 @@ proto_register_amqp(void) {&hf_amqp_header_file_headers, { "Headers", "amqp.method.properties.headers", FT_NONE, BASE_NONE, NULL, 0, - "headers", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_file_priority, { "Priority", "amqp.method.properties.priority", FT_UINT8, BASE_DEC, NULL, 0, - "priority", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_file_reply_to, { "Reply-To", "amqp.method.properties.reply_to", FT_STRING, BASE_NONE, NULL, 0, @@ -5143,11 +5143,11 @@ proto_register_amqp(void) {&hf_amqp_header_file_filename, { "Filename", "amqp.method.properties.filename", FT_STRING, BASE_NONE, NULL, 0, - "filename", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_file_timestamp, { "Timestamp", "amqp.method.properties.timestamp", FT_UINT64, BASE_DEC, NULL, 0, - "timestamp", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_file_cluster_id, { "Cluster-Id", "amqp.method.properties.cluster_id", FT_STRING, BASE_NONE, NULL, 0, @@ -5163,19 +5163,19 @@ proto_register_amqp(void) {&hf_amqp_header_stream_headers, { "Headers", "amqp.method.properties.headers", FT_NONE, BASE_NONE, NULL, 0, - "headers", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_stream_priority, { "Priority", "amqp.method.properties.priority", FT_UINT8, BASE_DEC, NULL, 0, - "priority", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_stream_timestamp, { "Timestamp", "amqp.method.properties.timestamp", FT_UINT64, BASE_DEC, NULL, 0, - "timestamp", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_tunnel_headers, { "Headers", "amqp.method.properties.headers", FT_NONE, BASE_NONE, NULL, 0, - "headers", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_tunnel_proxy_name, { "Proxy-Name", "amqp.method.properties.proxy_name", FT_STRING, BASE_NONE, NULL, 0, @@ -5187,11 +5187,11 @@ proto_register_amqp(void) {&hf_amqp_header_tunnel_durable, { "Durable", "amqp.method.properties.durable", FT_UINT8, BASE_DEC, NULL, 0, - "durable", HFILL}}, + NULL, HFILL}}, {&hf_amqp_header_tunnel_broadcast, { "Broadcast", "amqp.method.properties.broadcast", FT_UINT8, BASE_DEC, NULL, 0, - "broadcast", HFILL}}, + NULL, HFILL}}, {&hf_amqp_payload, { "Payload", "amqp.payload", FT_BYTES, BASE_NONE, NULL, 0, @@ -5203,11 +5203,11 @@ proto_register_amqp(void) {&hf_amqp_init_id_major, { "Protocol ID Major", "amqp.init.id_major", FT_UINT8, BASE_DEC, NULL, 0, - "Protocol ID major", HFILL}}, + NULL, HFILL}}, {&hf_amqp_init_id_minor, { "Protocol ID Minor", "amqp.init.id_minor", FT_UINT8, BASE_DEC, NULL, 0, - "Protocol ID minor", HFILL}}, + NULL, HFILL}}, {&hf_amqp_init_version_major, { "Version Major", "amqp.init.version_major", FT_UINT8, BASE_DEC, NULL, 0, diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index 5849846129..a675c91239 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.c @@ -324,12 +324,12 @@ proto_register_arcnet (void) {&hf_arcnet_split_flag, {"Split Flag", "arcnet.split_flag", FT_UINT8, BASE_DEC, NULL, 0, - "Split flag", HFILL} + NULL, HFILL} }, {&hf_arcnet_exception_flag, {"Exception Flag", "arcnet.exception_flag", FT_UINT8, BASE_HEX, NULL, 0, - "Exception flag", HFILL} + NULL, HFILL} }, {&hf_arcnet_sequence, {"Sequence", "arcnet.sequence", diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index 8e4b4b09e1..379b3e3c8b 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -1821,13 +1821,13 @@ proto_register_artnet(void) { { "Port number", "artnet.poll_reply.port_nr", FT_UINT16, BASE_DEC, NULL, 0x0, - "Port Number", HFILL }}, + NULL, HFILL }}, { &hf_artnet_poll_reply_versinfo, { "Version Info", "artnet.poll_reply.versinfo", FT_UINT16, BASE_HEX, NULL, 0x0, - "Version info", HFILL }}, + NULL, HFILL }}, { &hf_artnet_poll_reply_subswitch, { "SubSwitch", @@ -1839,7 +1839,7 @@ proto_register_artnet(void) { { "Oem", "artnet.poll_reply.oem", FT_UINT16, BASE_HEX, VALS(artnet_oem_code_vals), 0x0, - "OEM", HFILL }}, + NULL, HFILL }}, { &hf_artnet_poll_reply_ubea_version, { "UBEA Version", @@ -2099,19 +2099,19 @@ proto_register_artnet(void) { { "DMX data", "artnet.output.data", FT_NONE, BASE_NONE, NULL, 0x0, - "DMX Data", HFILL }}, + NULL, HFILL }}, { &hf_artnet_output_data_filter, { "DMX data filter", "artnet.output.data_filter", FT_BYTES, BASE_NONE, NULL, 0x0, - "DMX Data Filter", HFILL }}, + NULL, HFILL }}, { &hf_artnet_output_dmx_data, { "DMX data", "artnet.output.dmx_data", FT_NONE, BASE_NONE, NULL, 0x0, - "DMX Data", HFILL }}, + NULL, HFILL }}, /* ArtAddress */ diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 1e441dcb26..aeff7cff52 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -2022,7 +2022,7 @@ proto_register_atalk(void) static hf_register_info hf_atp[] = { { &hf_atp_ctrlinfo, { "Control info", "atp.ctrlinfo", FT_UINT8, BASE_HEX, - NULL, 0, "control info", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_atp_function, { "Function", "atp.function", FT_UINT8, BASE_DEC, diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index c1a3c7221d..debdeca4a7 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -9189,7 +9189,7 @@ proto_register_bacapp(void) }, { &hf_bacapp_tag_PORT, { "Port", "bacapp.Port", - FT_UINT16, BASE_DEC, NULL, 0, "Port", HFILL } + FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_bacapp_tag_initiatingObjectType, { "ObjectType", "bacapp.objectType", diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index c9856c37e9..04cab02416 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -496,7 +496,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( complete ) { guint8 code; - + /* fully dissectable packet ready */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "OBEX"); @@ -615,7 +615,7 @@ proto_register_btobex(void) {&hf_length, {"Packet Length", "btobex.pkt_len", FT_UINT16, BASE_DEC, NULL, 0, - "Packet Length", HFILL} + NULL, HFILL} }, {&hf_version, {"Version", "btobex.version", @@ -625,12 +625,12 @@ proto_register_btobex(void) {&hf_flags, {"Flags", "btobex.flags", FT_UINT8, BASE_HEX, NULL, 0x00, - "Flags", HFILL} + NULL, HFILL} }, {&hf_constants, {"Constants", "btobex.constants", FT_UINT8, BASE_HEX, NULL, 0x00, - "Constants", HFILL} + NULL, HFILL} }, {&hf_max_pkt_len, {"Max. Packet Length", "btobex.max_pkt_len", @@ -650,7 +650,7 @@ proto_register_btobex(void) {&hf_hdr_id, {"Header Id", "btobex.hdr_id", FT_UINT8, BASE_HEX, VALS(header_id_vals), 0x00, - "Header Id", HFILL} + NULL, HFILL} }, {&hf_hdr_length, {"Length", "btobex.pkt_hdr_len", @@ -680,7 +680,7 @@ proto_register_btobex(void) {&hf_data, {"Obex Data", "btobex.data", FT_NONE, BASE_NONE, NULL, 0, - "Obex Data", HFILL} + NULL, HFILL} }, /* for fragmentation */ diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 7ec1b51fee..60273573b4 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -1965,7 +1965,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_ccpri_lte(tvb, offset, pinfo, tree); return; } - + /* Many DCT2000 protocols have at least one IPPrim variant. If the protocol name can be matched to a dissector, try to find the @@ -2067,7 +2067,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (tvb_get_ptr(tvb, source_addr_offset, source_addr_length))); proto_tree_add_item(ipprim_tree, - (source_addr_length == 4) ? + (source_addr_length == 4) ? hf_catapult_dct2000_ipprim_src_addr_v4 : hf_catapult_dct2000_ipprim_src_addr_v6, tvb, source_addr_offset, source_addr_length, FALSE); @@ -2110,14 +2110,14 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dest_addr_length, (tvb_get_ptr(tvb, dest_addr_offset, dest_addr_length))); proto_tree_add_item(ipprim_tree, - (dest_addr_length == 4) ? + (dest_addr_length == 4) ? hf_catapult_dct2000_ipprim_dst_addr_v4 : hf_catapult_dct2000_ipprim_dst_addr_v6, tvb, dest_addr_offset, dest_addr_length, FALSE); /* Add hidden item for "side-less" addr */ addr_ti = proto_tree_add_item(ipprim_tree, - (dest_addr_length == 4) ? + (dest_addr_length == 4) ? hf_catapult_dct2000_ipprim_addr_v4 : hf_catapult_dct2000_ipprim_addr_v6, tvb, dest_addr_offset, dest_addr_length, FALSE); @@ -2223,14 +2223,14 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dest_addr_length, (tvb_get_ptr(tvb, dest_addr_offset, dest_addr_length))); proto_tree_add_item(sctpprim_tree, - (dest_addr_length == 4) ? + (dest_addr_length == 4) ? hf_catapult_dct2000_sctpprim_dst_addr_v4 : hf_catapult_dct2000_sctpprim_dst_addr_v6, tvb, dest_addr_offset, dest_addr_length, FALSE); /* Add hidden item for "side-less" addr */ addr_ti = proto_tree_add_item(sctpprim_tree, - (dest_addr_length == 4) ? + (dest_addr_length == 4) ? hf_catapult_dct2000_sctpprim_addr_v4 : hf_catapult_dct2000_sctpprim_addr_v6, tvb, dest_addr_offset, dest_addr_length, FALSE); @@ -2380,13 +2380,13 @@ void proto_register_catapult_dct2000(void) { &hf_catapult_dct2000_comment, { "Comment", "dct2000.comment", FT_STRING, BASE_NONE, NULL, 0x0, - "Comment", HFILL + NULL, HFILL } }, { &hf_catapult_dct2000_error_comment, { "Error comment", "dct2000.error-comment", FT_NONE, BASE_NONE, NULL, 0x0, - "Error Comment", HFILL + NULL, HFILL } }, { &hf_catapult_dct2000_dissected_length, diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 391cb00054..0020bfd06f 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -1835,7 +1835,7 @@ void proto_register_cms(void) { { &hf_cms_ci_contentType, { "contentType", "cms.contentInfo.contentType", FT_OID, BASE_NONE, NULL, 0, - "ContentType", HFILL }}, + NULL, HFILL }}, /*--- Included file: packet-cms-hfarr.c ---*/ #line 1 "packet-cms-hfarr.c" @@ -2407,8 +2407,8 @@ void proto_register_cms(void) { proto_register_field_array(proto_cms, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU); - register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU); + register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU); + register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU); register_ber_oid_syntax(".p7s", NULL, "ContentInfo"); register_ber_oid_syntax(".p7m", NULL, "ContentInfo"); register_ber_oid_syntax(".p7c", NULL, "ContentInfo"); diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index a071e08317..15bd0425e1 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -516,7 +516,7 @@ ctdb_hash(tvbuff_t *tvb, int offset, guint32 len) for(value=0x238F13AF*len, i=0; i < len; i++) value=(value+(tvb_get_guint8(tvb, offset+i) << (i*5 % 24))); - return (1103515243 * value + 12345); + return (1103515243 * value + 12345); } static int @@ -567,7 +567,7 @@ dissect_ctdb_reply_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto /* data */ proto_tree_add_item(tree, hf_ctdb_data, tvb, offset, datalen, endianess); offset+=datalen; - + return offset; } @@ -613,7 +613,7 @@ dissect_ctdb_reply_dmaster(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr /* data */ proto_tree_add_item(tree, hf_ctdb_data, tvb, offset, datalen, endianess); offset+=datalen; - + tkey[0].length=1; tkey[0].key=&reqid; tkey[1].length=1; @@ -787,7 +787,7 @@ dissect_ctdb_req_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot } ctdb_display_control(pinfo, tree, tvb, ctdb_control); - + return offset; } @@ -869,7 +869,7 @@ dissect_ctdb_reply_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr proto_tree_add_item(tree, hf_ctdb_error, tvb, offset, errorlen, endianess); offset+=datalen; } - + cd=find_control_dissector(ctdb_control->opcode, FALSE); if (cd) { @@ -901,7 +901,7 @@ dissect_ctdb_req_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } if(flags&0x00000001){ col_append_str(pinfo->cinfo, COL_INFO, " IMMEDIATE"); - } + } offset+=4; /* dbid */ @@ -998,7 +998,7 @@ dissect_ctdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) default: return FALSE; } - + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CTDB"); col_clear(pinfo->cinfo, COL_INFO); @@ -1104,116 +1104,116 @@ void proto_register_ctdb(void) { static hf_register_info hf[] = { - { &hf_ctdb_length, { - "Length", "ctdb.len", FT_UINT32, BASE_DEC, + { &hf_ctdb_length, { + "Length", "ctdb.len", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of CTDB PDU", HFILL }}, - { &hf_ctdb_dst, { - "Destination", "ctdb.dst", FT_UINT32, BASE_DEC, + { &hf_ctdb_dst, { + "Destination", "ctdb.dst", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_src, { - "Source", "ctdb.src", FT_UINT32, BASE_DEC, + { &hf_ctdb_src, { + "Source", "ctdb.src", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_id, { - "Id", "ctdb.id", FT_UINT32, BASE_DEC, + { &hf_ctdb_id, { + "Id", "ctdb.id", FT_UINT32, BASE_DEC, NULL, 0x0, "Transaction ID", HFILL }}, - { &hf_ctdb_opcode, { - "Opcode", "ctdb.opcode", FT_UINT32, BASE_DEC, + { &hf_ctdb_opcode, { + "Opcode", "ctdb.opcode", FT_UINT32, BASE_DEC, VALS(ctdb_opcodes), 0x0, "CTDB command opcode", HFILL }}, - { &hf_ctdb_flags_immediate, { - "Immediate", "ctdb.immediate", FT_BOOLEAN, 32, + { &hf_ctdb_flags_immediate, { + "Immediate", "ctdb.immediate", FT_BOOLEAN, 32, TFS(&flags_immediate_tfs), 0x00000001, "Force migration of DMASTER?", HFILL }}, - { &hf_ctdb_dbid, { - "DB Id", "ctdb.dbid", FT_UINT32, BASE_HEX, + { &hf_ctdb_dbid, { + "DB Id", "ctdb.dbid", FT_UINT32, BASE_HEX, VALS(ctdb_dbid_vals), 0x0, "Database ID", HFILL }}, - { &hf_ctdb_callid, { - "Call Id", "ctdb.callid", FT_UINT32, BASE_DEC, - NULL, 0x0, "Call ID", HFILL }}, - { &hf_ctdb_status, { - "Status", "ctdb.status", FT_UINT32, BASE_DEC, + { &hf_ctdb_callid, { + "Call Id", "ctdb.callid", FT_UINT32, BASE_DEC, + NULL, 0x0, NULL, HFILL }}, + { &hf_ctdb_status, { + "Status", "ctdb.status", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_datalen, { - "Data Length", "ctdb.datalen", FT_UINT32, BASE_DEC, + { &hf_ctdb_datalen, { + "Data Length", "ctdb.datalen", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_errorlen, { - "Error Length", "ctdb.errorlen", FT_UINT32, BASE_DEC, + { &hf_ctdb_errorlen, { + "Error Length", "ctdb.errorlen", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_keylen, { - "Key Length", "ctdb.keylen", FT_UINT32, BASE_DEC, + { &hf_ctdb_keylen, { + "Key Length", "ctdb.keylen", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_magic, { - "Magic", "ctdb.magic", FT_UINT32, BASE_HEX, + { &hf_ctdb_magic, { + "Magic", "ctdb.magic", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_version, { - "Version", "ctdb.version", FT_UINT32, BASE_DEC, + { &hf_ctdb_version, { + "Version", "ctdb.version", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_dmaster, { - "Dmaster", "ctdb.dmaster", FT_UINT32, BASE_DEC, + { &hf_ctdb_dmaster, { + "Dmaster", "ctdb.dmaster", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_generation, { - "Generation", "ctdb.generation", FT_UINT32, BASE_DEC, + { &hf_ctdb_generation, { + "Generation", "ctdb.generation", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_key, { - "Key", "ctdb.key", FT_BYTES, BASE_NONE, + { &hf_ctdb_key, { + "Key", "ctdb.key", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_keyhash, { - "KeyHash", "ctdb.keyhash", FT_UINT32, BASE_HEX, + { &hf_ctdb_keyhash, { + "KeyHash", "ctdb.keyhash", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_data, { - "Data", "ctdb.data", FT_BYTES, BASE_NONE, + { &hf_ctdb_data, { + "Data", "ctdb.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_error, { - "Error", "ctdb.error", FT_BYTES, BASE_NONE, + { &hf_ctdb_error, { + "Error", "ctdb.error", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_request_in, { - "Request In", "ctdb.request_in", FT_FRAMENUM, BASE_NONE, + { &hf_ctdb_request_in, { + "Request In", "ctdb.request_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_response_in, { - "Response In", "ctdb.response_in", FT_FRAMENUM, BASE_NONE, + { &hf_ctdb_response_in, { + "Response In", "ctdb.response_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_time, { - "Time since request", "ctdb.time", FT_RELATIVE_TIME, BASE_NONE, + { &hf_ctdb_time, { + "Time since request", "ctdb.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_hopcount, { - "Hopcount", "ctdb.hopcount", FT_UINT32, BASE_DEC, + { &hf_ctdb_hopcount, { + "Hopcount", "ctdb.hopcount", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_rsn, { - "RSN", "ctdb.rsn", FT_UINT64, BASE_HEX, + { &hf_ctdb_rsn, { + "RSN", "ctdb.rsn", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_ctrl_opcode, { - "CTRL Opcode", "ctdb.ctrl_opcode", FT_UINT32, BASE_DEC, + { &hf_ctdb_ctrl_opcode, { + "CTRL Opcode", "ctdb.ctrl_opcode", FT_UINT32, BASE_DEC, VALS(ctrl_opcode_vals), 0x0, NULL, HFILL }}, - { &hf_ctdb_srvid, { - "SrvId", "ctdb.srvid", FT_UINT64, BASE_HEX, + { &hf_ctdb_srvid, { + "SrvId", "ctdb.srvid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_clientid, { - "ClientId", "ctdb.clientid", FT_UINT32, BASE_HEX, + { &hf_ctdb_clientid, { + "ClientId", "ctdb.clientid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_ctrl_flags, { - "CTRL Flags", "ctdb.ctrl_flags", FT_UINT32, BASE_HEX, + { &hf_ctdb_ctrl_flags, { + "CTRL Flags", "ctdb.ctrl_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_recmaster, { - "Recovery Master", "ctdb.recmaster", FT_UINT32, BASE_DEC, + { &hf_ctdb_recmaster, { + "Recovery Master", "ctdb.recmaster", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_recmode, { - "Recovery Mode", "ctdb.recmode", FT_UINT32, BASE_DEC, + { &hf_ctdb_recmode, { + "Recovery Mode", "ctdb.recmode", FT_UINT32, BASE_DEC, VALS(recmode_vals), 0x0, NULL, HFILL }}, - { &hf_ctdb_num_nodes, { - "Num Nodes", "ctdb.num_nodes", FT_UINT32, BASE_DEC, + { &hf_ctdb_num_nodes, { + "Num Nodes", "ctdb.num_nodes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_vnn, { - "VNN", "ctdb.vnn", FT_UINT32, BASE_DEC, + { &hf_ctdb_vnn, { + "VNN", "ctdb.vnn", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_node_flags, { - "Node Flags", "ctdb.node_flags", FT_UINT32, BASE_HEX, + { &hf_ctdb_node_flags, { + "Node Flags", "ctdb.node_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_node_ip, { - "Node IP", "ctdb.node_ip", FT_IPv4, BASE_NONE, + { &hf_ctdb_node_ip, { + "Node IP", "ctdb.node_ip", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_pid, { - "PID", "ctdb.pid", FT_UINT32, BASE_DEC, + { &hf_ctdb_pid, { + "PID", "ctdb.pid", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_ctdb_process_exists, { - "Process Exists", "ctdb.process_exists", FT_BOOLEAN, 32, + { &hf_ctdb_process_exists, { + "Process Exists", "ctdb.process_exists", FT_BOOLEAN, 32, TFS(&process_exists_tfs), 0x01, NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c index 9bba79376f..5c15a6f912 100644 --- a/epan/dissectors/packet-db-lsp.c +++ b/epan/dissectors/packet-db-lsp.c @@ -181,7 +181,7 @@ proto_register_db_lsp (void) { &hf_type, { "Type", "db-lsp.type", FT_UINT8, BASE_DEC_HEX, VALS(type_vals), 0x0, - "Type", HFILL } }, + NULL, HFILL } }, { &hf_magic, { "Magic", "db-lsp.magic", @@ -195,8 +195,8 @@ proto_register_db_lsp (void) { &hf_opvalue, { "OP Value", "db-lsp.op", - FT_UINT8, BASE_DEC_HEX, VALS(op_vals), 0x0, - "OP Value", HFILL } }, + FT_UINT8, BASE_DEC_HEX, VALS(op_vals), 0x0, + NULL, HFILL } }, { &hf_value, { "Value", "db-lsp.value", @@ -205,7 +205,7 @@ proto_register_db_lsp (void) { &hf_data, { "Data", "db-lsp.data", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_text, diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index ee4136a456..e9b33a1be2 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -8128,15 +8128,15 @@ proto_register_dcerpc_netlogon(void) { &hf_netlogon_dos_rc, { "DOS error code", "netlogon.dos.rc", FT_UINT32, - BASE_HEX, VALS(DOS_errors), 0x0, "DOS Error Code", HFILL}}, + BASE_HEX, VALS(DOS_errors), 0x0, NULL, HFILL}}, { &hf_netlogon_werr_rc, { "WERR error code", "netlogon.werr.rc", FT_UINT32, - BASE_HEX, VALS(WERR_errors), 0x0, "WERR Error Code", HFILL}}, + BASE_HEX, VALS(WERR_errors), 0x0, NULL, HFILL}}, { &hf_netlogon_param_ctrl, { "Param Ctrl", "netlogon.param_ctrl", FT_UINT32, BASE_HEX, - NULL, 0x0, "Param ctrl", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_netlogon_logon_id, { "Logon ID", "netlogon.logon_id", FT_UINT64, BASE_DEC, @@ -8220,7 +8220,7 @@ proto_register_dcerpc_netlogon(void) { &hf_netlogon_lsapolicy_referentid, { "Referent ID", "netlogon.lsapolicy.referentID", FT_UINT32, BASE_HEX, - NULL, 0x0, "Referent ID", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_netlogon_lsapolicy_len, { "Length", "netlogon.lsapolicy.length", FT_UINT32, BASE_DEC, @@ -8256,11 +8256,11 @@ proto_register_dcerpc_netlogon(void) { &hf_netlogon_trust_len, { "Length", "netlogon.trust.extention_length", FT_UINT32, BASE_DEC, - NULL, 0, "Length", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_netlogon_trust_max, { "Max Count", "netlogon.trust.extention.maxcount", FT_UINT32, BASE_DEC, - NULL, 0, "Max Count", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_netlogon_dummy_string2, { "Dummy String2", "netlogon.dummy_string", FT_STRING, BASE_NONE, @@ -8392,11 +8392,11 @@ proto_register_dcerpc_netlogon(void) { &hf_netlogon_max_audit_event_count, { "Max Audit Event Count", "netlogon.max_audit_event_count", FT_UINT32, BASE_DEC, - NULL, 0x0, "Max audit event count", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_netlogon_event_audit_option, { "Event Audit Option", "netlogon.event_audit_option", FT_UINT32, BASE_HEX, - NULL, 0x0, "Event audit option", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_netlogon_sensitive_data_len, { "Length", "netlogon.sensitive_data_len", FT_UINT32, BASE_DEC, @@ -8536,7 +8536,7 @@ proto_register_dcerpc_netlogon(void) { &hf_netlogon_os_version, { "OS version", "netlogon.os.version", FT_STRING, BASE_NONE, - NULL, 0, "OS Version", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_netlogon_workstation_os, { "Wkst OS", "netlogon.wkst.os", FT_STRING, BASE_NONE, @@ -8572,7 +8572,7 @@ proto_register_dcerpc_netlogon(void) { &hf_netlogon_ad_client_dns_name, { "Client DNS Name", "netlogon.client_dns_name", FT_STRING, BASE_NONE, - NULL, 0, "Client DNS Name", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_netlogon_domain_name, { "Domain", "netlogon.domain", FT_STRING, BASE_NONE, @@ -8708,11 +8708,11 @@ proto_register_dcerpc_netlogon(void) { &hf_netlogon_user_account_control, { "User Account Control", "netlogon.user_account_control", FT_UINT32, BASE_HEX, - NULL, 0x0, "User Account control", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_netlogon_user_flags, { "User Flags", "netlogon.user_flags", FT_UINT32, BASE_HEX, - NULL, 0x0, "User flags", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_netlogon_auth_flags, { "Auth Flags", "netlogon.auth_flags", FT_UINT32, BASE_HEX, @@ -9196,7 +9196,7 @@ proto_register_dcerpc_netlogon(void) { &hf_netlogon_audit_retention_period, { "Audit Retention Period", "netlogon.audit_retention_period", FT_RELATIVE_TIME, BASE_NONE, - NULL, 0, "Audit retention period", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_netlogon_timelimit, { "Time Limit", "netlogon.time_limit", FT_RELATIVE_TIME, BASE_NONE, diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index edec8783a8..c8d1572d26 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -390,7 +390,7 @@ dissect_ndr_lsa_String(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree item = proto_tree_add_text(parent_tree, tvb, offset, 0, "%s: ", hf_info->name); tree = proto_item_add_subtree(item, ett_lsa_String); } - + offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_lsa_String_name_len, 0); offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_lsa_String_name_size, 0); @@ -1753,7 +1753,7 @@ void dcerpc_smb_init(int proto_dcerpc) { &hf_nt_acct_ctrl, { "Acct Ctrl", "dcerpc.nt.acct_ctrl", FT_UINT32, BASE_HEX, - NULL, 0x0, "Acct CTRL", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_nt_acb_disabled, { "Account disabled", "dcerpc.nt.acb.disabled", FT_BOOLEAN, 32, @@ -1840,11 +1840,11 @@ void dcerpc_smb_init(int proto_dcerpc) { "Attributes", "dcerpc.nt.attr", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_lsa_String_name_len, + { &hf_lsa_String_name_len, { "Name Len", "dcerpc.lsa_String.name_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_lsa_String_name_size, + { &hf_lsa_String_name_size, { "Name Size", "dcerpc.lsa_String.name_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index a96c31e610..d32f489325 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -7209,7 +7209,7 @@ proto_register_dcerpc_spoolss(void) { &hf_outputfile, { "Output file", "spoolss.outputfile", FT_STRING, BASE_NONE, - NULL, 0, "Output File", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_datatype, { "Datatype", "spoolss.Datatype", FT_STRING, BASE_NONE, diff --git a/epan/dissectors/packet-dcerpc-tapi.c b/epan/dissectors/packet-dcerpc-tapi.c index c379567104..72f2f545ba 100644 --- a/epan/dissectors/packet-dcerpc-tapi.c +++ b/epan/dissectors/packet-dcerpc-tapi.c @@ -79,11 +79,11 @@ dissect_tapi_client_attach_rqst(tvbuff_t *tvb, int offset, hf_tapi_unknown_long, NULL); offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, - NDR_POINTER_REF, "unknown string", + NDR_POINTER_REF, "unknown string", hf_tapi_unknown_string, 0); offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, - NDR_POINTER_REF, "unknown string", + NDR_POINTER_REF, "unknown string", hf_tapi_unknown_string, 0); return offset; @@ -204,7 +204,7 @@ void proto_register_dcerpc_tapi(void) { static hf_register_info hf[] = { - { &hf_tapi_opnum, { + { &hf_tapi_opnum, { "Operation", "tapi.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tapi_rc, { @@ -212,7 +212,7 @@ static hf_register_info hf[] = { VALS(NT_errors), 0x0, "TAPI return code", HFILL }}, { &hf_tapi_hnd, { "Context Handle", "tapi.hnd", FT_BYTES, BASE_NONE, - NULL, 0x0, "Context handle", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_tapi_unknown_long, { "Unknown long", "tapi.unknown.long", FT_UINT32, BASE_HEX, NULL, 0x0, "Unknown long. If you know what this is, contact wireshark developers.", HFILL }}, diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c index ce2dc5ecad..c78910c3b4 100644 --- a/epan/dissectors/packet-ddtp.c +++ b/epan/dissectors/packet-ddtp.c @@ -180,7 +180,7 @@ proto_register_ddtp(void) "Host ID", HFILL }}, { &hf_ddtp_msgtype, { "Message type", "ddtp.msgtype", FT_UINT32, BASE_DEC, VALS(vals_ddtp_msgtype), 0x0, - "Message Type", HFILL }}, + NULL, HFILL }}, { &hf_ddtp_opcode, { "Opcode", "ddtp.opcode", FT_UINT32, BASE_DEC, VALS(vals_ddtp_opcode), 0x0, "Update query opcode", HFILL }}, diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 0cfb56f995..d27eb47d8d 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -1305,11 +1305,11 @@ proto_register_dec_rt(void) { &hf_dec_rt_dst_addr, { "Destination Address", "dec_dna.dst.address", FT_ETHER, BASE_NONE, NULL, 0x0, - "Destination address", HFILL }}, + NULL, HFILL }}, { &hf_dec_rt_src_addr, { "Source Address", "dec_dna.src.addr", FT_ETHER, BASE_NONE, NULL, 0x0, - "Source address", HFILL }}, + NULL, HFILL }}, { &hf_dec_rt_nl2, { "Next level 2 router", "dec_dna.nl2", FT_UINT8, BASE_HEX, NULL, 0x0, @@ -1490,7 +1490,7 @@ proto_register_dec_rt(void) { &hf_dec_sess_grp_code, { "Session Group code", "dec_dna.sess.grp_code", FT_UINT16, BASE_HEX, NULL, 0x0, - "Session group code", HFILL }}, + NULL, HFILL }}, { &hf_dec_sess_usr_code, { "Session User code", "dec_dna.sess.usr_code", FT_UINT16, BASE_HEX, NULL, 0x0, @@ -1506,15 +1506,15 @@ proto_register_dec_rt(void) { &hf_dec_sess_obj_type, { "Session Object type", "dec_dna.sess.obj_type", FT_UINT8, BASE_HEX, NULL, 0x0, - "Session object type", HFILL }}, + NULL, HFILL }}, { &hf_dec_sess_menu_ver, { "Session Menu version", "dec_dna.sess.menu_ver", FT_STRING, BASE_NONE, NULL, 0x0, - "Session menu version", HFILL }}, + NULL, HFILL }}, { &hf_dec_sess_rqstr_id, { "Session Requestor ID", "dec_dna.sess.rqstr_id", FT_STRING, BASE_NONE, NULL, 0x0, - "Session requestor ID", HFILL }}, + NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index b8b92f320b..ddb03c4e07 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -828,7 +828,7 @@ static const gchar *msg_type_to_str (void) { const gchar *msg_type; gboolean have_msg = FALSE; - + switch (dmp.msg_type) { case STANAG: @@ -840,25 +840,25 @@ static const gchar *msg_type_to_str (void) val_to_str (dmp.prec-4, precedence, "Unknown") : val_to_str (dmp.prec, precedence, "Unknown")); break; - + case IPM: /* Include importance */ msg_type = ep_strdup_printf ("%s [%s]", val_to_str (dmp.msg_type, type_vals, "Unknown"), val_to_str (dmp.prec, importance, "Unknown")); break; - + case REPORT: /* Include report types included */ msg_type = ep_strdup_printf ("Report (%s%s%s)", dmp.dr ? "DR" : "", (dmp.dr && dmp.ndr) ? " and " : "", dmp.ndr ? "NDR" : ""); break; - + case NOTIF: msg_type = val_to_str (dmp.notif_type, notif_type, "Unknown"); break; - + case ACK: /* If we have msg_time we have a matching packet */ have_msg = (dmp.id_val && @@ -868,12 +868,12 @@ static const gchar *msg_type_to_str (void) " (unknown:%d)") : "", dmp.ack_reason ? " [negative]" : ""); break; - + default: msg_type = "Unknown"; break; } - + return msg_type; } @@ -1135,11 +1135,11 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason) /* No analysis of error packets */ return; } - + dmp_key = se_alloc (sizeof (dmp_id_key)); - if (!pinfo->fd->flags.visited && - (dmp.msg_type == REPORT || dmp.msg_type == NOTIF)) + if (!pinfo->fd->flags.visited && + (dmp.msg_type == REPORT || dmp.msg_type == NOTIF)) { /* Try to match corresponding message */ dmp_key->id = (guint) dmp.subj_id; @@ -1282,7 +1282,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, en = proto_tree_add_uint (analysis_tree, hf_analysis_msg_num, tvb, 0, 0, dmp.id_val->msg_id); PROTO_ITEM_SET_GENERATED (en); - + nstime_delta (&ns, &pinfo->fd->abs_ts, &dmp.id_val->rep_not_msg_time); en = proto_tree_add_time (analysis_tree, hf_analysis_rep_time, tvb, 0, 0, &ns); @@ -1291,7 +1291,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, en = proto_tree_add_item (analysis_tree, hf_analysis_msg_missing, tvb, 0, 0, FALSE); PROTO_ITEM_SET_GENERATED (en); - + expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Message missing"); } @@ -1300,7 +1300,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, en = proto_tree_add_uint (analysis_tree, hf_analysis_msg_num, tvb, 0, 0, dmp.id_val->msg_id); PROTO_ITEM_SET_GENERATED (en); - + nstime_delta (&ns, &pinfo->fd->abs_ts, &dmp.id_val->rep_not_msg_time); en = proto_tree_add_time (analysis_tree, hf_analysis_not_time, tvb, 0, 0, &ns); @@ -1309,21 +1309,21 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, en = proto_tree_add_item (analysis_tree, hf_analysis_msg_missing, tvb, 0, 0, FALSE); PROTO_ITEM_SET_GENERATED (en); - + expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Message missing"); } } - + if (dmp.id_val->msg_resend_count) { en = proto_tree_add_uint (analysis_tree, hf_analysis_retrans_no, tvb, 0, 0, dmp.id_val->msg_resend_count); PROTO_ITEM_SET_GENERATED (en); - + expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Retransmission #%d", dmp.id_val->msg_resend_count); - + if (dmp.msg_type == REPORT) { en = proto_tree_add_uint (analysis_tree, hf_analysis_rep_resend_from, tvb, 0, 0, dmp.id_val->rep_id); @@ -1335,17 +1335,17 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, tvb, 0, 0, dmp.id_val->msg_id); } PROTO_ITEM_SET_GENERATED (en); - + nstime_delta (&ns, &pinfo->fd->abs_ts, &dmp.id_val->prev_msg_time); en = proto_tree_add_time (analysis_tree, hf_analysis_retrans_time, tvb, 0, 0, &ns); PROTO_ITEM_SET_GENERATED (en); - + nstime_delta (&ns, &pinfo->fd->abs_ts, &dmp.id_val->first_msg_time); eh = proto_tree_add_time (analysis_tree, hf_analysis_total_retrans_time, tvb, 0, 0, &ns); PROTO_ITEM_SET_GENERATED (eh); - + if (dmp.id_val->first_msg_time.secs == dmp.id_val->prev_msg_time.secs && dmp.id_val->first_msg_time.nsecs == dmp.id_val->prev_msg_time.nsecs) { /* Time values does not differ, hide the total time */ @@ -1365,17 +1365,17 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, tvb, 0, 0, dmp.id_val->msg_id); } PROTO_ITEM_SET_GENERATED (en); - + nstime_delta (&ns, &pinfo->fd->abs_ts, &dmp.id_val->msg_time); en = proto_tree_add_time (analysis_tree, hf_analysis_ack_time, tvb, 0, 0, &ns); PROTO_ITEM_SET_GENERATED (en); - + nstime_delta (&ns, &pinfo->fd->abs_ts, &dmp.id_val->first_msg_time); eh = proto_tree_add_time (analysis_tree, hf_analysis_total_time, tvb, 0, 0, &ns); PROTO_ITEM_SET_GENERATED (eh); - + if (dmp.id_val->first_msg_time.secs == dmp.id_val->msg_time.secs && dmp.id_val->first_msg_time.nsecs == dmp.id_val->msg_time.nsecs) { /* Time values does not differ, hide the total time */ @@ -1389,19 +1389,19 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, en = proto_tree_add_item (analysis_tree, hf_analysis_msg_missing, tvb, 0, 0, FALSE); PROTO_ITEM_SET_GENERATED (en); - + expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Message missing"); } - + if (dmp.id_val->ack_resend_count) { en = proto_tree_add_uint (analysis_tree, hf_analysis_ack_dup_no, tvb, 0, 0, dmp.id_val->ack_resend_count); PROTO_ITEM_SET_GENERATED (en); - + expert_add_info_format (pinfo, en, PI_SEQUENCE, PI_NOTE, "Dup ACK #%d", dmp.id_val->ack_resend_count); - + en = proto_tree_add_uint (analysis_tree, hf_analysis_ack_resend_from, tvb, 0, 0, dmp.id_val->ack_id); PROTO_ITEM_SET_GENERATED (en); @@ -3566,7 +3566,7 @@ void proto_register_dmp (void) */ { &hf_dmp_id, { "DMP Identifier", "dmp.id", FT_UINT16, BASE_DEC, - NULL, 0x0, "DMP identifier", HFILL}}, + NULL, 0x0, NULL, HFILL}}, /* ** Envelope @@ -3603,7 +3603,7 @@ void proto_register_dmp (void) /* Message identifier */ { &hf_envelope_msg_id, { "Message Identifier", "dmp.msg_id", FT_UINT16, BASE_DEC, - NULL, 0x0, "Message identifier", HFILL}}, + NULL, 0x0, NULL, HFILL}}, /* Submission time */ { &hf_envelope_subm_time, @@ -4059,7 +4059,7 @@ void proto_register_dmp (void) VALS (notif_type), 0x03, NULL, HFILL } }, { &hf_notif_rec_time, { "Receipt Time", "dmp.receipt_time", FT_UINT8, BASE_HEX, - NULL, 0x0, "Receipt time", HFILL } }, + NULL, 0x0, NULL, HFILL } }, { &hf_notif_rec_time_val, { "Receipt Time Value", "dmp.receipt_time_val", FT_UINT8, BASE_HEX, NULL, 0xFF, NULL, HFILL } }, @@ -4164,19 +4164,19 @@ void proto_register_dmp (void) { "Duplicate ACK #", "dmp.analysis.dup_ack_no", FT_UINT32, BASE_DEC, NULL, 0x0, "Duplicate Acknowledgement count", HFILL } }, { &hf_analysis_msg_resend_from, - { "Retransmission of Message sent in", "dmp.analysis.msg_first_sent_in", + { "Retransmission of Message sent in", "dmp.analysis.msg_first_sent_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "This Message was first sent in this frame", HFILL } }, { &hf_analysis_rep_resend_from, - { "Retransmission of Report sent in", "dmp.analysis.report_first_sent_in", + { "Retransmission of Report sent in", "dmp.analysis.report_first_sent_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "This Report was first sent in this frame", HFILL } }, { &hf_analysis_not_resend_from, - { "Retransmission of Notification sent in", "dmp.analysis.notif_first_sent_in", + { "Retransmission of Notification sent in", "dmp.analysis.notif_first_sent_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "This Notification was first sent in this frame", HFILL } }, { &hf_analysis_ack_resend_from, - { "Retransmission of Acknowledgement sent in", "dmp.analysis.ack_first_sent_in", + { "Retransmission of Acknowledgement sent in", "dmp.analysis.ack_first_sent_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "This Acknowledgement was first sent in this frame", HFILL } }, @@ -4292,7 +4292,7 @@ void proto_register_dmp (void) proto_dmp = proto_register_protocol (PNAME, PSNAME, PFNAME); register_dissector(PFNAME, dissect_dmp, proto_dmp); - + proto_register_field_array (proto_dmp, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); register_init_routine (&dmp_init_routine); @@ -4370,7 +4370,7 @@ void proto_reg_handoff_dmp (void) /* Save port number for later deletion */ dmp_port_range = range_copy (global_dmp_port_range); - + range_foreach (dmp_port_range, range_add_callback); } diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index cd7db251ef..1723f27425 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -3619,7 +3619,7 @@ proto_register_dns(void) { &hf_dns_apl_coded_prefix, { "Prefix Length", "hf.dns.apl.coded.prefix", FT_UINT8, BASE_DEC, NULL, 0, - "Prefix Length", HFILL }}, + NULL, HFILL }}, { &hf_dns_apl_negation, { "Negation Flag", "dns.apl.negation", FT_BOOLEAN, 8, TFS(&tfs_dns_apl_negation), DNS_APL_NEGATION, @@ -3631,7 +3631,7 @@ proto_register_dns(void) { &hf_dns_nsap_rdata, { "NSAP Data", "dns.nsap.rdata", FT_BYTES, BASE_NONE, NULL, 0, - "NSAP Data", HFILL }} + NULL, HFILL }} }; static gint *ett[] = { &ett_dns, diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index d4969b19e7..1bdfce4fc3 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -1925,12 +1925,12 @@ proto_register_dtls(void) { &hf_dtls_record, { "Record Layer", "dtls.record", FT_NONE, BASE_NONE, NULL, 0x0, - "Record layer", HFILL } + NULL, HFILL } }, { &hf_dtls_record_content_type, { "Content Type", "dtls.record.content_type", FT_UINT8, BASE_DEC, VALS(ssl_31_content_type), 0x0, - "Content type", HFILL} + NULL, HFILL} }, { &hf_dtls_record_version, { "Version", "dtls.record.version", @@ -2040,7 +2040,7 @@ proto_register_dtls(void) { &hf_dtls_handshake_cipher_suite, { "Cipher Suite", "dtls.handshake.ciphersuite", FT_UINT16, BASE_HEX, VALS(ssl_31_ciphersuite), 0x0, - "Cipher suite", HFILL } + NULL, HFILL } }, { &hf_dtls_handshake_cookie_len, { "Cookie Length", "dtls.handshake.cookie_length", diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index 86d936fa8c..bf1dbe5a81 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -485,7 +485,7 @@ proto_register_fix(void) { &hf_fix_field_value, { "Field Value", "fix.field.value", FT_STRING, BASE_NONE, NULL, 0x0, - "Field value", HFILL }}, + NULL, HFILL }}, { &hf_fix_checksum_good, { "Good Checksum", "fix.checksum_good", FT_BOOLEAN, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c index c95217f7bb..a373bf9f53 100644 --- a/epan/dissectors/packet-fmp.c +++ b/epan/dissectors/packet-fmp.c @@ -36,7 +36,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/strutil.h> -#include "packet-fmp.h" +#include "packet-fmp.h" #include "packet-rpc.h" @@ -121,22 +121,22 @@ dissect_fmp_genString(tvbuff_t *tvb, int offset, proto_tree *tree) switch (mode) { case FMP_ASCII: - proto_tree_add_text(tree, tvb, offset, 4, + proto_tree_add_text(tree, tvb, offset, 4, "Encoding Mode: ASCII (%d)", mode); break; - + case FMP_UTF8: proto_tree_add_text(tree, tvb, offset, 4, "Encoding Mode: UTF8 (%d)", mode); break; - + case FMP_UNICODE1: - proto_tree_add_text(tree, tvb, offset, 4, + proto_tree_add_text(tree, tvb, offset, 4, "Encoding Mode: UNICODE (%d)", mode); break; default: - proto_tree_add_text(tree, tvb, offset, 4, + proto_tree_add_text(tree, tvb, offset, 4, "Encoding Mode: UNKNOWN (%d)", mode); offset += 4; return offset; @@ -194,22 +194,22 @@ dissect_fmp_fileHandleSrc(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_item *fileHandleItem; proto_tree *fileHandleTree; int length; - + length = get_fileHandleSrc_size(tvb, offset); np = tvb_get_ntohl(tvb, offset); - fileHandleItem = proto_tree_add_text(tree, tvb, offset, length, + fileHandleItem = proto_tree_add_text(tree, tvb, offset, length, "Source File Handle"); - fileHandleTree = proto_item_add_subtree(fileHandleItem, + fileHandleTree = proto_item_add_subtree(fileHandleItem, ett_fmp_fileHandle); switch (np) { case FMP_PATH: - proto_tree_add_text(fileHandleTree, tvb, offset, 4, + proto_tree_add_text(fileHandleTree, tvb, offset, 4, "Native Protocol: PATH (%d)", np); offset += 4; - + offset = dissect_rpc_string(tvb, fileHandleTree, hf_fmp_mount_path, offset, NULL); break; @@ -219,12 +219,12 @@ dissect_fmp_fileHandleSrc(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, "Native Protocol: NFS (%d)", np); offset += 4; - offset = dissect_rpc_data(tvb, fileHandleTree, - hf_fmp_nfsFHandle, offset); + offset = dissect_rpc_data(tvb, fileHandleTree, + hf_fmp_nfsFHandle, offset); break; case FMP_CIFS: - proto_tree_add_text(fileHandleTree, tvb, offset, 4, + proto_tree_add_text(fileHandleTree, tvb, offset, 4, "Native Protocol: CIFS (%d)", np); offset += 4; @@ -242,12 +242,12 @@ dissect_fmp_fileHandleSrc(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, break; case FMP_FMP: - proto_tree_add_text(fileHandleTree, tvb, offset, 4, + proto_tree_add_text(fileHandleTree, tvb, offset, 4, "Native Protocol: FMP (%d)", np); offset += 4; offset = dissect_rpc_string(tvb, fileHandleTree, - hf_fmp_fmpFHandle, offset, NULL); + hf_fmp_fmpFHandle, offset, NULL); break; case FMP_FS_ONLY: @@ -291,7 +291,7 @@ dissect_fmp_fileHandleSrc(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_text(fileHandleTree, tvb, offset, 2, "uid : %d", tvb_get_ntohs(tvb, offset)); offset += 2; - + proto_tree_add_text(fileHandleTree, tvb, offset, 2, "cifsPort: %d", tvb_get_ntohs(tvb, offset)); offset += 2; @@ -303,7 +303,7 @@ dissect_fmp_fileHandleSrc(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_fmp_genString(tvb, offset, fileHandleTree); break; - + default: proto_tree_add_text(fileHandleTree, tvb, offset, 4, @@ -373,7 +373,7 @@ dissect_fmp_extentList(tvbuff_t *tvb, int offset, packet_info *pinfo, } numExtents = tvb_get_ntohl(tvb, offset); - totalLength = 4 + (20 * numExtents); + totalLength = 4 + (20 * numExtents); extListItem = proto_tree_add_text(tree, tvb, offset, totalLength, "Extent List"); @@ -435,7 +435,7 @@ int dissect_plugInID(tvbuff_t *tvb, int offset, proto_tree *tree) { const guint8 *plugInID; - + if (!tree) { return offset; } @@ -494,7 +494,7 @@ dissect_fmp_flushCmd(tvbuff_t *tvb, int offset, proto_tree *tree) /* clear the bit that we processed */ cmd &= ~bitValue; - + /* add a "bitwise inclusive OR" symbol between cmds */ if (cmd) { g_strlcat(msg, " | ", MAX_MSG_SIZE); @@ -524,21 +524,21 @@ dissect_InterpretVolMgtStuff(tvbuff_t *tvb, int offset, proto_tree *tree) length = tvb_get_ntohl(tvb, offset); proto_tree_add_text(tree, tvb, offset, 4, "Length of List : %d", length); offset += 4; - + for(j=0;j<length;j++){ proto_tree_add_text(tree, tvb, offset, 4, "sigOffset: 0x%x", tvb_get_ntohl(tvb, offset)); offset += 4; offset = dissect_rpc_string(tvb, tree, hf_fmp_dskSigEnt_val, - offset, NULL); - + offset, NULL); + } offset = dissect_rpc_uint32(tvb, tree, hf_fmp_volID, offset); - + } return offset; - - + + } int dissect_fmp_capability(tvbuff_t *tvb, int offset, proto_tree *tree) @@ -580,7 +580,7 @@ dissect_fmp_capability(tvbuff_t *tvb, int offset, proto_tree *tree) break; - + default: proto_tree_add_text(tree, tvb, offset, 4, @@ -633,7 +633,7 @@ dissect_fmp_heartBeatIntv(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, return offset; } - proto_tree_add_text(tree, tvb, offset, 8, + proto_tree_add_text(tree, tvb, offset, 8, "Heart Beat Interval: %d.%d seconds", tvb_get_ntohl(tvb, offset), tvb_get_ntohl(tvb, offset+4)); @@ -666,7 +666,7 @@ dissect_fmp_status(tvbuff_t *tvb, int offset, proto_tree *tree, int *rval) *rval = 1; break; case FMP_INVALIDARG: - + *rval = 1; break; case FMP_FSFULL: @@ -711,7 +711,7 @@ dissect_fmp_status(tvbuff_t *tvb, int offset, proto_tree *tree, int *rval) *rval = 1; break; } - + offset = dissect_rpc_uint32(tvb, tree, hf_fmp_status , offset); return offset; } @@ -749,7 +749,7 @@ dissect_fmp_devSerial(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset += 4; offset = dissect_rpc_string(tvb, tree, hf_fmp_devSignature, - offset, NULL); + offset, NULL); return offset; } @@ -898,7 +898,7 @@ int dissect_fmp_Hiervolume(tvbuff_t *tvb, int offset, proto_tree * tree) offset = dissect_fmp_VolumeDescription(tvb, offset, tree); vollength--; } - + return offset; } @@ -933,11 +933,11 @@ dissect_fmp_vmInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 4; /* - * Loop through and print all of the devInfo + * Loop through and print all of the devInfo * structures. */ while (phyVolList_len) { - offset = + offset = dissect_fmp_devSerial(tvb, offset, pinfo, tree); volIndex = tvb_get_ntohl(tvb, offset); proto_tree_add_text(tree, tvb, offset, 4, "0x%x", @@ -954,7 +954,7 @@ dissect_fmp_vmInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 4; offset = dissect_rpc_string(tvb, tree, hf_fmp_volHandle, - offset, NULL); + offset, NULL); break; case FMP_CLIENT_BASED_DART: @@ -964,7 +964,7 @@ dissect_fmp_vmInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, offset += 4; offset = dissect_rpc_string(tvb, tree, hf_fmp_volHandle, - offset, NULL); + offset, NULL); break; case FMP_CLIENT_BASED_SIMPLE: @@ -996,7 +996,7 @@ dissect_fmp_vmInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, "Volume Mgmt Type: FMP_HIERARCHICAL_VOLUME: (%d)", vmType); offset += 4; - + dissect_fmp_Hiervolume(tvb, offset, tree); break; @@ -1162,7 +1162,7 @@ dissect_FMP_SessionCreate_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_rpc_string(tvb, tree, hf_fmp_hostID, - offset, NULL); + offset, NULL); offset = dissect_fmp_timeval(tvb, offset, pinfo, tree, hf_fmp_btime, hf_fmp_time_sec, hf_fmp_time_nsec); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_notifyPort, @@ -1179,7 +1179,7 @@ dissect_FMP_SessionCreate_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_fmp_status(tvb, offset,tree, &rval); if (rval == 0) { offset = dissect_rpc_data(tvb, tree, - hf_fmp_sessionHandle, offset); + hf_fmp_sessionHandle, offset); offset = dissect_rpc_string(tvb, tree, hf_fmp_hostID, offset, NULL); offset = dissect_fmp_timeval(tvb, offset, pinfo, tree, @@ -1196,7 +1196,7 @@ dissect_FMP_HeartBeat_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { offset = dissect_rpc_data(tvb, tree, hf_fmp_sessionHandle, - offset); + offset); return offset; } @@ -1244,10 +1244,10 @@ dissect_FMP_Open_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_rpc_data(tvb, tree, hf_fmp_sessionHandle, - offset); + offset); offset = dissect_fmp_fileHandleSrc(tvb, offset, pinfo, tree); return offset; -} +} static int dissect_FMP_Open_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, @@ -1258,11 +1258,11 @@ dissect_FMP_Open_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_fmp_status(tvb, offset,tree, &rval); if (rval == 0) { offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, - offset); + offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); offset = dissect_rpc_uint64(tvb, tree, hf_fmp_fileSize, - offset); + offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_fsID, offset); @@ -1274,7 +1274,7 @@ static int dissect_FMP_Close_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); + offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); return offset; } @@ -1298,7 +1298,7 @@ static int dissect_FMP_OpenGetMap_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_rpc_data(tvb, tree, hf_fmp_sessionHandle, - offset); + offset); offset = dissect_fmp_fileHandleSrc(tvb, offset, pinfo, tree); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_firstLogBlk, @@ -1318,7 +1318,7 @@ dissect_FMP_OpenGetMap_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_fmp_status(tvb, offset,tree, &rval); if (rval == 0) { offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, - offset); + offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_cookie, @@ -1338,7 +1338,7 @@ dissect_FMP_OpenAllocSpace_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_rpc_data(tvb , tree, hf_fmp_sessionHandle, - offset); + offset); offset = dissect_fmp_fileHandleSrc(tvb, offset, pinfo, tree); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_firstLogBlk, offset); @@ -1357,7 +1357,7 @@ dissect_FMP_OpenAllocSpace_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_fmp_status(tvb, offset,tree, &rval); if (rval == 0) { offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, - offset); + offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_cookie, @@ -1375,7 +1375,7 @@ static int dissect_FMP_GetMap_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); + offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_firstLogBlk, offset); @@ -1409,7 +1409,7 @@ static int dissect_FMP_AllocSpace_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); + offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_firstLogBlk, offset); @@ -1443,7 +1443,7 @@ static int dissect_FMP_Flush_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); + offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); offset = dissect_fmp_flushCmd(tvb, offset, tree); offset = dissect_rpc_uint64(tvb,tree, hf_fmp_eof, offset); @@ -1459,7 +1459,7 @@ dissect_FMP_Flush_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_fmp_status(tvb, offset,tree, &rval); if (rval == 0) { - offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, + offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); } return offset; @@ -1469,7 +1469,7 @@ static int dissect_FMP_CancelReq_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); + offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_cookie, offset); return offset; @@ -1494,7 +1494,7 @@ dissect_FMP_PlugIn_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { offset = dissect_plugInID(tvb, offset, tree); - offset = dissect_rpc_data(tvb, tree, hf_fmp_plugInBuf, offset); + offset = dissect_rpc_data(tvb, tree, hf_fmp_plugInBuf, offset); return offset; } @@ -1507,7 +1507,7 @@ dissect_FMP_PlugIn_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_fmp_status(tvb, offset,tree, &rval); if (rval == 0) { offset = dissect_rpc_data(tvb, tree, hf_fmp_plugInBuf, - offset); + offset); } return offset; } @@ -1517,7 +1517,7 @@ dissect_FMP_SessionTerminate_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { offset = dissect_rpc_data(tvb, tree, hf_fmp_sessionHandle, - offset); + offset); return offset; } @@ -1536,7 +1536,7 @@ dissect_FMP_SessionCreateEx_request(tvbuff_t *tvb, int offset,packet_info *pinfo { offset = dissect_rpc_string(tvb, tree, hf_fmp_hostID, - offset, NULL); + offset, NULL); offset = dissect_fmp_timeval(tvb, offset, pinfo ,tree, hf_fmp_btime, hf_fmp_time_sec, hf_fmp_time_nsec); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_notifyPort, @@ -1549,7 +1549,7 @@ dissect_FMP_SessionCreateEx_request(tvbuff_t *tvb, int offset,packet_info *pinfo offset); offset = dissect_rpc_string(tvb, tree, hf_fmp_os_name, - offset, NULL); + offset, NULL); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_os_patch, offset); @@ -1572,9 +1572,9 @@ dissect_FMP_SessionCreateEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_fmp_status(tvb, offset, tree, &rval); if (rval == 0) { offset = dissect_rpc_data(tvb, tree, - hf_fmp_sessionHandle, offset); + hf_fmp_sessionHandle, offset); offset = dissect_rpc_string(tvb, tree, hf_fmp_hostID, - offset, NULL); + offset, NULL); offset = dissect_fmp_timeval(tvb, offset, pinfo ,tree, hf_fmp_btime, hf_fmp_time_sec, hf_fmp_time_nsec); @@ -1587,7 +1587,7 @@ dissect_FMP_SessionCreateEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset); offset = dissect_rpc_string(tvb, tree, hf_fmp_server_version_string, - offset, NULL); + offset, NULL); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_os_patch, offset); @@ -1603,7 +1603,7 @@ dissect_FMP_SessionCreateEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int -dissect_FMP_ReportClientError_request(tvbuff_t *tvb, int offset, +dissect_FMP_ReportClientError_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { offset = dissect_rpc_string(tvb, tree, hf_fmp_description, @@ -1614,7 +1614,7 @@ dissect_FMP_ReportClientError_request(tvbuff_t *tvb, int offset, } static int -dissect_FMP_ReportClientError_reply(tvbuff_t *tvb, int offset, +dissect_FMP_ReportClientError_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { int rval; @@ -1716,7 +1716,7 @@ dissect_FMP_FlushGetAttr_reply(tvbuff_t *tvb, int offset, offset = dissect_fmp_attrs(tvb, offset, tree); } - + return offset; } @@ -1771,7 +1771,7 @@ dissect_FMP_OpenGetMapEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ offset = dissect_fmp_status(tvb, offset,tree, &rval); if (rval == 0) { offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, - offset); + offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_cookie, @@ -1792,7 +1792,7 @@ dissect_FMP_OpenAllocSpaceEx_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_rpc_data(tvb , tree, hf_fmp_sessionHandle, - offset); + offset); offset = dissect_fmp_fileHandleSrc(tvb, offset, pinfo, tree); offset = dissect_rpc_uint64(tvb, tree, hf_fmp_firstLogBlk64, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_numBlksReq, @@ -1811,7 +1811,7 @@ dissect_FMP_OpenAllocSpaceEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo offset = dissect_fmp_status(tvb, offset,tree, &rval); if (rval == 0) { offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, - offset); + offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_cookie, @@ -1829,7 +1829,7 @@ static int dissect_FMP_GetMapEx_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); + offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); offset = dissect_rpc_uint64(tvb, tree, hf_fmp_firstLogBlk64, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_numBlksReq, @@ -1864,7 +1864,7 @@ static int dissect_FMP_AllocSpaceEx_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); + offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); offset = dissect_rpc_uint64(tvb, tree, hf_fmp_firstLogBlk64, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_numBlksReq, @@ -1898,7 +1898,7 @@ static int dissect_FMP_FlushEx_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); + offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset); offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); offset = dissect_fmp_flushCmd(tvb, offset, tree); offset = dissect_rpc_uint64(tvb,tree, hf_fmp_eof, offset); @@ -1914,7 +1914,7 @@ dissect_FMP_FlushEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_fmp_status(tvb, offset,tree, &rval); if (rval == 0) { - offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, + offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset); } return offset; @@ -1998,7 +1998,7 @@ static const vsff fmp3_proc[] = { { 24 , "FlushGetAttrEx", dissect_FMP_FlushGetAttrEx_request, dissect_FMP_FlushGetAttrEx_reply }, -#endif +#endif { 25 , "GetVolumeInfo", dissect_FMP_GetVolumeInfo_request, dissect_FMP_GetVolumeInfo_reply }, @@ -2093,11 +2093,11 @@ proto_register_fmp(void) { &hf_fmp_time_sec, { "seconds", "fmp.btime.sec", FT_UINT32, BASE_DEC, - NULL, 0, "Seconds", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_fmp_time_nsec, { "nanoseconds", "fmp.btime.nsec", FT_UINT32, BASE_DEC, - NULL, 0, "Nanoseconds", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_fmp_notifyPort, { "Notify Port", "fmp.notifyPort", FT_UINT32, BASE_DEC, @@ -2169,7 +2169,7 @@ proto_register_fmp(void) BASE_DEC, NULL, 0, "FMP Extent List Length", HFILL }}, { &hf_fmp_extent_state, { - "Extent State", "fmp.extentState", FT_UINT32,BASE_DEC, + "Extent State", "fmp.extentState", FT_UINT32,BASE_DEC, VALS(fmp_extentState_vals), 0, "FMP Extent State", HFILL }}, { &hf_fmp_firstLogBlk, { @@ -2183,7 +2183,7 @@ proto_register_fmp(void) { &hf_fmp_volID, { "Volume ID inside DART", "fmp.volID", FT_UINT32, BASE_HEX, NULL, 0, "FMP Volume ID inside DART", HFILL }}, - + { &hf_fmp_startOffset, { "Start Offset", "fmp.startOffset", FT_UINT32, BASE_DEC, NULL, 0, "FMP Start Offset", HFILL }}, @@ -2238,14 +2238,14 @@ proto_register_fmp(void) NULL, 0, NULL, HFILL }}, { &hf_fmp_nfsv3Attr_uid, { "uid", "fmp.nfsv3Attr_uid", FT_UINT32, BASE_DEC, - NULL, 0, "UID", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_fmp_nfsv3Attr_gid, { "gid", "fmp.nfsv3Attr_gid", FT_UINT32, BASE_DEC, - NULL, 0, "GID", HFILL }}, + NULL, 0, NULL, HFILL }}, /* for nfsv3Attr_size use hf_fmp_fileSize */ { &hf_fmp_nfsv3Attr_used, { "Used", "fmp.nfsv3Attr_used", FT_UINT64, BASE_DEC, - NULL, 0, "used", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_fmp_nfsv3Attr_rdev, { "rdev", "fmp.nfsv3Attr_rdev", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -2257,7 +2257,7 @@ proto_register_fmp(void) NULL, 0, "fileid", HFILL }}, { &hf_fmp_cmd, { "Command", "fmp.cmd", FT_UINT32, BASE_DEC, - NULL, 0, "command", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_fmp_topVolumeId, { "Top Volume ID", "fmp.topVolumeId", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -2292,19 +2292,19 @@ proto_register_fmp(void) &ett_HierVolumeDescription, &ett_attrs }; - + module_t *fmp_module; proto_fmp = proto_register_protocol("File Mapping Protocol", "FMP", "fmp"); - + proto_register_field_array(proto_fmp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - fmp_module=prefs_register_protocol(proto_fmp, NULL); - + fmp_module=prefs_register_protocol(proto_fmp, NULL); + prefs_register_bool_preference(fmp_module, "fhandle_find_both_reqrep", "Fhandle filters finds both request/response", - "With this option display filters for fmp fhandle a RPC call, even if the actual fhandle is only present in one of the packets" + "With this option display filters for fmp fhandle a RPC call, even if the actual fhandle is only present in one of the packets" , &fmp_fhandle_reqrep_matching); } diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index 72476e9111..fe02d972d5 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -523,7 +523,7 @@ dissect_fr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, "Final address octet: 0x%02x", fr_octet); octet_tree = proto_item_add_subtree(octet_item, ett_fr_address); - } + } /* * Last octet - contains lower DLCI or DL-CORE control, DLCI or @@ -543,7 +543,7 @@ dissect_fr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } proto_tree_add_boolean(octet_tree, hf_fr_dc, tvb, offset, 1, fr_octet); proto_tree_add_boolean(octet_tree, hf_fr_ea, tvb, offset, 1, fr_octet); - + offset++; } } @@ -837,7 +837,7 @@ void proto_register_fr(void) NULL, 0x0, "Data-Link Connection Identifier", HFILL }}, { &hf_fr_control, { "Control Field", "fr.control", FT_UINT8, BASE_HEX, - NULL, 0x0, "Control field", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_fr_n_r, { "N(R)", "fr.control.n_r", FT_UINT16, BASE_DEC, NULL, XDLC_N_R_EXT_MASK, NULL, HFILL }}, diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c index 8963ba8c98..a04f4dc182 100644 --- a/epan/dissectors/packet-gsm_bsslap.c +++ b/epan/dissectors/packet-gsm_bsslap.c @@ -7,17 +7,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -94,7 +94,7 @@ const value_string gsm_bsslap_elem_strings[] = { { 0x00, "Reserved" }, { BSSLAP_PARAM_TIMING_ADVANCE, "Timing Advance" }, { BSSLAP_PARAM_RESERVED_01, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_CELL_IDENTITY, "Cell Identity" }, + { BSSLAP_PARAM_CELL_IDENTITY, "Cell Identity" }, { BSSLAP_PARAM_RESERVED_02, "Reserved" }, /* (note) */ { BSSLAP_PARAM_RESERVED_03, "Reserved" }, /* (note) */ { BSSLAP_PARAM_RESERVED_04, "Reserved" }, /* (note) */ @@ -179,7 +179,7 @@ de_ta(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add return(curr_offset - offset); } -/* +/* * 5.12 Measurement Report IE */ #if 0 @@ -234,7 +234,7 @@ static guint16 de_rrlp_flg(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; - + curr_offset = offset; proto_tree_add_item(tree, hf_gsm_bsslap_rrlp_flg, tvb, curr_offset, 1, FALSE); curr_offset++; @@ -247,7 +247,7 @@ de_rrlp_ie(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar guint32 curr_offset; tvbuff_t *rrlp_tvb; guint16 length; - + length = tvb_get_ntohs(tvb, offset); curr_offset = offset + 2; @@ -264,7 +264,7 @@ de_rrlp_ie(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar /* * 5.17 Cell Identity List IE */ -/* +/* * The Cell identification discriminator i is coded as follows: */ const value_string gsm_a_bsslap_cell_id_disc_vals[] = { @@ -286,7 +286,7 @@ de_cell_id_list(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gcha guint8 num_cells; proto_item *item = NULL; proto_tree *subtree = NULL; - + curr_offset = offset; cell_id_disc = tvb_get_guint8(tvb,curr_offset); num_cells = 0; @@ -327,13 +327,13 @@ de_cell_id_list(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gcha /* lengt is "cell id" + discriminator */ proto_item_set_len(item, consumed+1); } - + return(curr_offset - offset); } /* * 5.18 Enhanced Measurement Report IE - * The Enhanced Measurement Results field is encoded as the contents of the + * The Enhanced Measurement Results field is encoded as the contents of the * ENHANCED MEASUREMENT REPORT message in 3GPP TS 44.018 (excluding the fields: * "RR short PD", "Message type" and "Short layer 2 header")... */ @@ -377,7 +377,7 @@ de_ms_pow(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar return(curr_offset - offset); } -/* +/* * 5.22 Delta Timer IE */ static guint16 @@ -417,7 +417,7 @@ de_blap_enc_key(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, * 5.26 Channel Mode IE * The Channel Mode information element is coded as defined in TS 44.018 (excluding IEI). */ -/* +/* * 5.27 MultiRate Configuration IE * The MultiRate Configuration information element is coded as defined in TS 44.018 (excluding IEI). */ @@ -457,7 +457,7 @@ de_pkt_ch_desc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar * The TFI information element is coded as defined in TS 44.060 (excluding IEI). * 44.060: * UPLINK_TFI (5 bit field) - * The Temporary Flow Identity field identifies an uplink Temporary Block Flow (TBF). + * The Temporary Flow Identity field identifies an uplink Temporary Block Flow (TBF). * This field is encoded as a binary number. Range 0 to 31 */ static guint16 @@ -486,7 +486,7 @@ typedef enum DE_BLAP_RES1, /. Reserved ./ DE_BLAP_TA, /. Timing Advance ./ DE_BLAP_RES3, /. Reserved ./ /. (note) ./ - DE_BLAP_RES4, /. Cell Identity ./ + DE_BLAP_RES4, /. Cell Identity ./ DE_BLAP_RES5, /. Reserved ./ /. (note) ./ DE_BLAP_RES6, /. Reserved ./ /. (note) ./ DE_BLAP_RES7, /. Reserved ./ /. (note) ./ @@ -525,7 +525,7 @@ guint16 (*bsslap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gu NULL, /* Reserved */ de_ta, /* Timing Advance */ NULL, /* Reserved */ /* (note) */ - NULL, /* "Cell Identity */ + NULL, /* "Cell Identity */ NULL, /* "Reserved */ /* (note) */ NULL, /* "Reserved */ /* (note) */ NULL, /* "Reserved */ /* (note) */ @@ -747,7 +747,7 @@ dissect_gsm_bsslap_u_tdoa_req(tvbuff_t *tvb, proto_tree *tree, int offset) ELEM_OPT_TV(BSSLAP_PARAM_DELTA_TIMER, GSM_A_PDU_TYPE_BSSLAP, DE_BLAP_DELTA_TIME, NULL); /* Polling Repitition IE 5.28 (note) C (note 2) TV 2 */ ELEM_OPT_TV(BSSLAP_PARAM_POLLING_REPETITION, GSM_A_PDU_TYPE_BSSLAP, DE_BLAP_POLL_REP, NULL); - + return; } /* 4.2.12 U-TDOA Response ETSI TS 148 071 V7.2.0 (2007-06) */ @@ -820,7 +820,7 @@ dissect_gsm_bsslap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Only message type IE */ break; case BSSLAP_TA_RESPONSE: - dissect_gsm_bsslap_ta_res(tvb, sub_tree, offset); + dissect_gsm_bsslap_ta_res(tvb, sub_tree, offset); break; case BSSLAP_REJECT: dissect_gsm_bsslap_reject(tvb, sub_tree, offset); @@ -828,7 +828,7 @@ dissect_gsm_bsslap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case BSSLAP_RESET: dissect_gsm_bsslap_reset(tvb, sub_tree, offset); break; - case BSSLAP_ABORT: + case BSSLAP_ABORT: dissect_gsm_bsslap_abort(tvb, sub_tree, offset); break; case BSSLAP_TA_LAYER3: @@ -862,7 +862,7 @@ proto_reg_handoff_gsm_bsslap(void) void proto_register_gsm_bsslap(void) -{ +{ guint i; guint last_offset; @@ -871,7 +871,7 @@ proto_register_gsm_bsslap(void) static hf_register_info hf[] = { { &hf_gsm_bsslap_msg_type, { "Message Type IE", "gsm_bsslap.msg_type", - FT_UINT8, BASE_DEC, VALS(gsm_a_bsslap_msg_strings), 0x0, + FT_UINT8, BASE_DEC, VALS(gsm_a_bsslap_msg_strings), 0x0, NULL, HFILL } }, { &hf_gsm_a_bsslap_elem_id, @@ -881,48 +881,48 @@ proto_register_gsm_bsslap(void) }, { &hf_gsm_bsslap_ta, { "Timing Advance", "gsm_bsslap.ta", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, - { &hf_gsm_bsslap_timer_value, - {"Timer Value", "gsm_bsslap.timerValue", - FT_UINT8, BASE_DEC, NULL, 0x0, + { &hf_gsm_bsslap_timer_value, + {"Timer Value", "gsm_bsslap.timerValue", + FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_gsm_bsslap_ms_pow, - {"MS Power", "gsm_bsslap.MS_pow", - FT_UINT8, BASE_DEC, NULL, 0x0, - "MS power", HFILL } + { &hf_gsm_bsslap_ms_pow, + {"MS Power", "gsm_bsslap.MS_pow", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } }, { &hf_gsm_bsslap_cause, - {"Cause", "gsm_bsslap.cause", - FT_UINT8, BASE_DEC, VALS(gsm_bsslap_cause_vals), 0x0, + {"Cause", "gsm_bsslap.cause", + FT_UINT8, BASE_DEC, VALS(gsm_bsslap_cause_vals), 0x0, NULL, HFILL } }, { &hf_gsm_bsslap_rrlp_flg, - {"RRLP Flag", "gsm_bsslap.rrlp_flg", - FT_UINT8, BASE_DEC, TFS(&gsm_bsslap_rrlp_flg_vals), 0x01, + {"RRLP Flag", "gsm_bsslap.rrlp_flg", + FT_UINT8, BASE_DEC, TFS(&gsm_bsslap_rrlp_flg_vals), 0x01, "Cause", HFILL } }, { &hf_gsm_bsslap_tfi, - {"TFI", "gsm_bsslap.tfi", - FT_UINT8, BASE_DEC, NULL, 0x1f, + {"TFI", "gsm_bsslap.tfi", + FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL } }, { &hf_gsm_bsslap_poll_rep, - {"Number of polling repetitions", "gsm_bsslap.poll_rep", - FT_UINT8, BASE_DEC, NULL, 0x3F, + {"Number of polling repetitions", "gsm_bsslap.poll_rep", + FT_UINT8, BASE_DEC, NULL, 0x3F, NULL, HFILL } }, { &hf_gsm_bsslap_lac, - {"Location Area Code", "gsm_bsslap.lac", - FT_UINT8, BASE_DEC, NULL, 0x3f, + {"Location Area Code", "gsm_bsslap.lac", + FT_UINT8, BASE_DEC, NULL, 0x3f, NULL, HFILL } }, { &hf_gsm_bsslap_cell_id_disc, - {"Cell identification Discriminator", "gsm_bsslap.cell_id_disc", - FT_UINT8, BASE_DEC, VALS(gsm_a_bsslap_cell_id_disc_vals), 0xf, + {"Cell identification Discriminator", "gsm_bsslap.cell_id_disc", + FT_UINT8, BASE_DEC, VALS(gsm_a_bsslap_cell_id_disc_vals), 0xf, NULL, HFILL } }, }; @@ -951,7 +951,7 @@ proto_register_gsm_bsslap(void) /* Register the protocol name and description */ - proto_gsm_bsslap = + proto_gsm_bsslap = proto_register_protocol("BSS LCS Assistance Protocol", "BSSLAP", "bsslap"); diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 8b699c23e8..9f75e5d041 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -6657,7 +6657,7 @@ void proto_register_gtp(void) {&hf_gtp_chrg_ipv6, {"CG address IPv6", "gtp.chrg_ipv6", FT_IPv6, BASE_NONE, NULL, 0, "Charging Gateway address IPv6", HFILL}}, {&hf_gtp_ext_flow_label, {"Flow Label Data I", "gtp.ext_flow_label", FT_UINT16, BASE_HEX, NULL, 0, "Flow label data", HFILL}}, {&hf_gtp_ext_id, {"Extension identifier", "gtp.ext_id", FT_UINT16, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0, "Extension Identifier", HFILL}}, - {&hf_gtp_ext_val, {"Extension value", "gtp.ext_val", FT_BYTES, BASE_NONE, NULL, 0, "Extension Value", HFILL}}, + {&hf_gtp_ext_val, {"Extension value", "gtp.ext_val", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}}, {&hf_gtp_flags, {"Flags", "gtp.flags", FT_UINT8, BASE_HEX, NULL, 0, "Ver/PT/Spare...", HFILL}}, {&hf_gtp_flags_ver, {"Version", "gtp.flags.version", @@ -6695,7 +6695,7 @@ void proto_register_gtp(void) HFILL}}, {&hf_gtp_flow_ii, {"Flow Label Data II", "gtp.flow_ii", FT_UINT16, BASE_DEC, NULL, 0, "Downlink flow label data", HFILL}}, {&hf_gtp_flow_label, {"Flow label", "gtp.flow_label", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}}, - {&hf_gtp_flow_sig, {"Flow label Signalling", "gtp.flow_sig", FT_UINT16, BASE_HEX, NULL, 0, "Flow label signalling", HFILL}}, + {&hf_gtp_flow_sig, {"Flow label Signalling", "gtp.flow_sig", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}}, {&hf_gtp_gsn_addr_len, {"GSN Address Length", "gtp.gsn_addr_len", FT_UINT8, BASE_DEC, NULL, GTP_EXT_GSN_ADDR_LEN_MASK, NULL, HFILL}}, {&hf_gtp_gsn_addr_type, @@ -6707,11 +6707,11 @@ void proto_register_gtp(void) {&hf_gtp_map_cause, {"MAP cause", "gtp.map_cause", FT_UINT8, BASE_DEC, VALS(gsm_old_GSMMAPLocalErrorcode_vals), 0, NULL, HFILL}}, {&hf_gtp_message_type, {"Message Type", "gtp.message", FT_UINT8, BASE_HEX, VALS(message_type), 0x0, "GTP Message Type", HFILL}}, {&hf_gtp_ms_reason, - {"MS not reachable reason", "gtp.ms_reason", FT_UINT8, BASE_DEC, VALS(ms_not_reachable_type), 0, "MS Not Reachable Reason", HFILL}}, + {"MS not reachable reason", "gtp.ms_reason", FT_UINT8, BASE_DEC, VALS(ms_not_reachable_type), 0, NULL, HFILL}}, {&hf_gtp_ms_valid, {"MS validated", "gtp.ms_valid", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_gtp_msisdn, {"MSISDN", "gtp.msisdn", FT_STRING, BASE_NONE, NULL, 0, "MS international PSTN/ISDN number", HFILL}}, {&hf_gtp_next, - {"Next extension header type", "gtp.next", FT_UINT8, BASE_HEX, VALS(next_extension_header_fieldvals), 0, "Next Extension Header Type", + {"Next extension header type", "gtp.next", FT_UINT8, BASE_HEX, VALS(next_extension_header_fieldvals), 0, NULL, HFILL}}, {&hf_gtp_node_ipv4, {"Node address IPv4", "gtp.node_ipv4", FT_IPv4, BASE_NONE, NULL, 0, "Recommended node address IPv4", HFILL}}, {&hf_gtp_node_ipv6, {"Node address IPv6", "gtp.node_ipv6", FT_IPv6, BASE_NONE, NULL, 0, "Recommended node address IPv6", HFILL}}, @@ -6795,9 +6795,9 @@ void proto_register_gtp(void) {&hf_gtp_sel_mode, {"Selection mode", "gtp.sel_mode", FT_UINT8, BASE_DEC, VALS(sel_mode_type), 0x03, - "Selection Mode", HFILL} + NULL, HFILL} }, - {&hf_gtp_seq_number, {"Sequence number", "gtp.seq_number", FT_UINT16, BASE_HEX, NULL, 0, "Sequence Number", HFILL}}, + {&hf_gtp_seq_number, {"Sequence number", "gtp.seq_number", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}}, {&hf_gtp_sndcp_number, {"SNDCP N-PDU LLC Number", "gtp.sndcp_number", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL}}, {&hf_gtp_tear_ind, {"Teardown Indicator", "gtp.tear_ind", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_gtp_teid, {"TEID", "gtp.teid", FT_UINT32, BASE_HEX, NULL, 0, "Tunnel Endpoint Identifier", HFILL}}, diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c index 79a8dc93cf..9cacc49358 100644 --- a/epan/dissectors/packet-h248_annex_c.c +++ b/epan/dissectors/packet-h248_annex_c.c @@ -231,7 +231,7 @@ static const value_string h248_annexc_package_properties_vals[] = { { 0x4018, "ceetd" }, { 0x4019, "QosClass" }, { 0x401a, "AALtype" }, - + { 0x5001, "DLCI" }, { 0x5002, "CID" }, { 0x5003, "SID/Noiselevel" }, @@ -313,7 +313,7 @@ static const value_string h248_annexc_package_properties_vals[] = { { 0xC004, "OLCrej" }, { 0xC005, "CLC" }, { 0xC006, "CLCack" }, - + { 0, NULL } }; @@ -408,7 +408,7 @@ static const value_string h248_pkg_annexc_userrate_values[] = { {0xd,"38.4 kbps (V.110)"}, {0xe,"48 kbps (X.1)"}, {0xf,"56 kbps"}, - + {0x12,"57.6 kbps (V.14 extended)"}, {0x13,"28.8 kbps (V.110)"}, {0x14,"24 kbps (V.110)"}, @@ -423,7 +423,7 @@ static const value_string h248_pkg_annexc_userrate_values[] = { {0x1d,"0.200 kbps (X.1)"}, {0x1e,"0.300 kbps (X.1)"}, {0x1f,"12 kbps (X.1)"}, - + {0,NULL} }; @@ -539,7 +539,7 @@ static const value_string h248_pkg_annexc_modem_values[] = { {0x03,"National Use"}, {0x04,"National Use"}, {0x05,"National Use"}, - + {0x11,"V.21"}, {0x12,"V.22"}, {0x13,"V.22bis"}, @@ -553,7 +553,7 @@ static const value_string h248_pkg_annexc_modem_values[] = { {0x1B,"V.29"}, {0x1D,"V.32"}, {0x1E,"V.34"}, - + {0x20,"National Use"}, {0x21,"National Use"}, {0x22,"National Use"}, @@ -570,7 +570,7 @@ static const value_string h248_pkg_annexc_modem_values[] = { {0x2d,"National Use"}, {0x2e,"National Use"}, {0x2f,"National Use"}, - + {0x30,"User Specified"}, {0x31,"User Specified"}, {0x32,"User Specified"}, @@ -587,7 +587,7 @@ static const value_string h248_pkg_annexc_modem_values[] = { {0x3d,"User Specified"}, {0x3e,"User Specified"}, {0x3f,"User Specified"}, - + {0,NULL} }; @@ -745,7 +745,7 @@ static void dissect_h248_annexc_acodec(proto_tree* tree, asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, &new_tvb); - + tree = proto_item_add_subtree(asn1_ctx.created_item,ett_codec); len = tvb_length(new_tvb); dissect_codec_mode(tree,new_tvb,0,len); @@ -760,9 +760,9 @@ static void dissect_h248_annexc_BIR(proto_tree* tree, tvbuff_t* new_tvb = NULL; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, &new_tvb); - + if ( new_tvb && h248_info->term && ! h248_info->term->bir ) { h248_info->term->bir = se_strdup(tvb_bytes_to_str(new_tvb,0,tvb_length(new_tvb))); } @@ -821,16 +821,16 @@ static h248_pkg_param_t h248_annexc_package_properties[] = { { 0x100D, &hf_h248_pkg_annexc_jitterbuf, h248_param_ber_integer, NULL }, { 0x100E, &hf_h248_pkg_annexc_propdelay, h248_param_ber_integer, NULL }, { 0x100F, &hf_h248_pkg_annexc_rtp_payload, h248_param_ber_integer, NULL }, - + { 0x2001, &hf_h248_pkg_annexc_h222, h248_param_ber_octetstring, NULL }, { 0x2002, &hf_h248_pkg_annexc_h223, h248_param_ber_octetstring, NULL }, { 0x2003, &hf_h248_pkg_annexc_v76, h248_param_ber_octetstring, NULL }, { 0x2004, &hf_h248_pkg_annexc_h2250, h248_param_ber_octetstring, NULL }, - + { 0x3001, &hf_h248_pkg_annexc_Mediatx, h248_param_ber_integer, NULL }, { 0x3002, &hf_h248_pkg_annexc_BIR, dissect_h248_annexc_BIR, NULL }, { 0x3003, &hf_h248_pkg_annexc_NSAP, dissect_h248_annexc_NSAP, NULL }, - + { 0x4001, &hf_h248_pkg_annexc_aesa, h248_param_ber_octetstring, NULL }, { 0x4002, &hf_h248_pkg_annexc_vp, dissect_h248_annexc_vpvc, NULL }, { 0x4003, &hf_h248_pkg_annexc_sc, h248_param_ber_integer, NULL }, @@ -862,27 +862,27 @@ static h248_pkg_param_t h248_annexc_package_properties[] = { { 0x5002, &hf_h248_pkg_annexc_cid, h248_param_ber_integer, NULL }, { 0x5003, &hf_h248_pkg_annexc_sid, h248_param_ber_integer, NULL }, { 0x5004, &hf_h248_pkg_annexc_ppt, h248_param_ber_integer, NULL }, - + { 0x6001, &hf_h248_pkg_annexc_ipv4, h248_param_ber_octetstring, NULL }, { 0x6002, &hf_h248_pkg_annexc_ipv6, h248_param_ber_octetstring,NULL }, { 0x6003, &hf_h248_pkg_annexc_port, h248_param_ber_integer, NULL }, { 0x6004, &hf_h248_pkg_annexc_porttype, h248_param_ber_integer, NULL }, - + { 0x7001, &hf_h248_pkg_annexc_aesa, h248_param_ber_octetstring, NULL }, { 0x7002, &hf_h248_pkg_annexc_alc, h248_param_ber_octetstring,NULL }, /* from ALCAP */ - { 0x7003, &hf_h248_pkg_annexc_sscs, h248_param_ber_octetstring, NULL }, - { 0x7004, &hf_h248_pkg_annexc_sut, h248_param_ber_octetstring, NULL }, - { 0x7005, &hf_h248_pkg_annexc_tci, h248_param_ber_boolean, NULL }, - { 0x7006, &hf_h248_pkg_annexc_timer_cu, h248_param_ber_octetstring, NULL }, - { 0x7007, &hf_h248_pkg_annexc_maxcpssdu, h248_param_ber_integer, NULL }, - { 0x7008, &hf_h248_pkg_annexc_cid, h248_param_ber_integer, NULL }, - + { 0x7003, &hf_h248_pkg_annexc_sscs, h248_param_ber_octetstring, NULL }, + { 0x7004, &hf_h248_pkg_annexc_sut, h248_param_ber_octetstring, NULL }, + { 0x7005, &hf_h248_pkg_annexc_tci, h248_param_ber_boolean, NULL }, + { 0x7006, &hf_h248_pkg_annexc_timer_cu, h248_param_ber_octetstring, NULL }, + { 0x7007, &hf_h248_pkg_annexc_maxcpssdu, h248_param_ber_integer, NULL }, + { 0x7008, &hf_h248_pkg_annexc_cid, h248_param_ber_integer, NULL }, + { 0x8001, &hf_h248_pkg_annexc_aal1st, h248_param_ber_integer, NULL }, { 0x8002, &hf_h248_pkg_annexc_cbrr, h248_param_ber_integer, NULL }, - { 0x8003, &hf_h248_pkg_annexc_scri, h248_param_ber_integer, NULL }, - { 0x8004, &hf_h248_pkg_annexc_ecm, h248_param_ber_integer, NULL }, - { 0x8005, &hf_h248_pkg_annexc_sdbt, h248_param_ber_octetstring,NULL }, - { 0x8006, &hf_h248_pkg_annexc_pfci, h248_param_ber_integer, NULL }, + { 0x8003, &hf_h248_pkg_annexc_scri, h248_param_ber_integer, NULL }, + { 0x8004, &hf_h248_pkg_annexc_ecm, h248_param_ber_integer, NULL }, + { 0x8005, &hf_h248_pkg_annexc_sdbt, h248_param_ber_octetstring,NULL }, + { 0x8006, &hf_h248_pkg_annexc_pfci, h248_param_ber_integer, NULL }, { 0x9001, &hf_h248_pkg_annexc_tmr, h248_param_ber_integer, NULL }, { 0x9002, &hf_h248_pkg_annexc_tmrsr, h248_param_ber_integer, NULL }, @@ -919,7 +919,7 @@ static h248_pkg_param_t h248_annexc_package_properties[] = { { 0x9021, &hf_h248_pkg_annexc_echoci, h248_param_ber_integer, NULL }, { 0x9022, &hf_h248_pkg_annexc_nci, h248_param_ber_integer, NULL }, { 0x9023, &hf_h248_pkg_annexc_USI, dissect_h248_annexc_USI, NULL }, - + { 0xA001, &hf_h248_pkg_annexc_fmsdu, h248_param_ber_octetstring, NULL }, { 0xA002, &hf_h248_pkg_annexc_bmsdu, h248_param_ber_octetstring, NULL }, { 0xA003, &hf_h248_pkg_annexc_sscs, NULL, NULL }, @@ -939,14 +939,14 @@ static h248_pkg_param_t h248_annexc_package_properties[] = { { 0xB00d, &hf_h248_pkg_annexc_sdp_t, h248_param_ber_octetstring, &h248_c_implicit }, { 0xB00e, &hf_h248_pkg_annexc_sdp_r, h248_param_ber_octetstring, &h248_c_implicit }, { 0xB00f, &hf_h248_pkg_annexc_sdp_m, h248_param_ber_octetstring, &h248_c_implicit }, - + { 0xC001, &hf_h248_pkg_annexc_olc, h248_param_ber_octetstring, NULL }, { 0xC002, &hf_h248_pkg_annexc_olcack, h248_param_ber_octetstring, NULL }, { 0xC003, &hf_h248_pkg_annexc_olccnf, h248_param_ber_octetstring, NULL }, { 0xC004, &hf_h248_pkg_annexc_olcrej, h248_param_ber_octetstring, NULL }, { 0xC005, &hf_h248_pkg_annexc_clc, h248_param_ber_octetstring, NULL }, { 0xC006, &hf_h248_pkg_annexc_clcack, h248_param_ber_octetstring, NULL }, - + { 0, NULL, NULL, NULL } }; @@ -1085,7 +1085,7 @@ void proto_register_h248_annex_c(void) { { "UPPC", "h248.pkg.annexc.uppc", FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_uppc_values), 0x03, "User Plane Connection Configuration", HFILL }}, - + { &hf_h248_pkg_annexc_pcr0, { "PCR0", "h248.pkg.annexc.pcr0", FT_UINT24, BASE_DEC, NULL, 0, @@ -1098,7 +1098,7 @@ void proto_register_h248_annex_c(void) { { "MBS0", "h248.pkg.annexc.mbs0", FT_UINT24, BASE_DEC, NULL, 0, "Maximum Burst Size for CLP=0", HFILL }}, - + { &hf_h248_pkg_annexc_pcr1, { "PCR1", "h248.pkg.annexc.pcr1", FT_UINT24, BASE_DEC, NULL, 0, @@ -1111,7 +1111,7 @@ void proto_register_h248_annex_c(void) { { "MBS1", "h248.pkg.annexc.mbs1", FT_UINT24, BASE_DEC, NULL, 0, "Maximum Burst Size for CLP=1", HFILL }}, - + { &hf_h248_pkg_annexc_bei, { "BEI", "h248.pkg.annexc.bei", FT_BOOLEAN, BASE_NONE, NULL, 0x0, @@ -1124,7 +1124,7 @@ void proto_register_h248_annex_c(void) { { "FD", "h248.pkg.annexc.fd", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Frame Discard", HFILL }}, - + { &hf_h248_pkg_annexc_a2pcdv, { "A2PCDV", "h248.pkg.annexc.a2pcdv", FT_UINT24, BASE_DEC, NULL, 0, @@ -1145,7 +1145,7 @@ void proto_register_h248_annex_c(void) { { "ACLR", "h248.pkg.annexc.aclr", FT_UINT8, BASE_DEC, NULL, 0, "Acceptable Cell Loss Ratio (Q.2965.2 ATMF UNI 4.0)", HFILL }}, - + { &hf_h248_pkg_annexc_meetd, { "MEETD", "h248.pkg.annexc.meetd", FT_UINT16, BASE_DEC, NULL, 0, @@ -1162,7 +1162,7 @@ void proto_register_h248_annex_c(void) { { "AALtype", "h248.pkg.annexc.aaltype", FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_AALtype_values), 0, "AAL Type", HFILL }}, - + { &hf_h248_pkg_annexc_dlci, { "DLCI", "h248.pkg.annexc.dlci", FT_UINT32, BASE_DEC, NULL, 0, @@ -1179,7 +1179,7 @@ void proto_register_h248_annex_c(void) { { "PPT", "h248.pkg.annexc.ppt", FT_UINT32, BASE_DEC, NULL, 0, "Primary Payload Type", HFILL }}, - + { &hf_h248_pkg_annexc_ipv4, { "IPv4", "h248.pkg.annexc.ipv4", FT_IPv4, BASE_NONE, NULL, 0, @@ -1196,7 +1196,7 @@ void proto_register_h248_annex_c(void) { { "PortType", "h248.pkg.annexc.porttype", FT_UINT32, BASE_DEC, VALS(h248_pkg_annexc_porttype_values), 0, "Port Type", HFILL }}, - + { &hf_h248_pkg_annexc_alc, { "ALC", "h248.pkg.annexc.alc", FT_BYTES, BASE_NONE, NULL, 0, @@ -1255,7 +1255,7 @@ void proto_register_h248_annex_c(void) { { "Continuity Check", "h248.pkg.annexc.tmsr", FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_contcheck_values), 0x0C, NULL, HFILL }}, - + { &hf_h248_pkg_annexc_itc, { "ITC", "h248.pkg.annexc.itc", FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_itc_values), 0x1f, @@ -1280,7 +1280,7 @@ void proto_register_h248_annex_c(void) { { "UPPC", "h248.pkg.annexc.negotiation", FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_negotiation_values), 0x40, "Negotiation", HFILL }}, - + { &hf_h248_pkg_annexc_userrate, { "Userrate", "h248.pkg.annexc.userrate", FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_userrate_values), 0x1f, @@ -1321,7 +1321,7 @@ void proto_register_h248_annex_c(void) { { "llidnegot", "h248.pkg.annexc.llidnegot", FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_llidnegot_values), 0xc0, "Logical Link Identifier negotiation", HFILL }}, - + { &hf_h248_pkg_annexc_assign, { "llidnegot", "h248.pkg.annexc.assign", FT_UINT8, BASE_HEX, VALS(h248_pkg_annexc_assign_values), 0xc0, @@ -1379,18 +1379,18 @@ void proto_register_h248_annex_c(void) { { "NCI", "h248.pkg.annexc.nci", FT_UINT8, BASE_HEX, NULL, 0xff, "Nature of Connection Indicator", HFILL }}, - - + + { &hf_h248_pkg_annexc_USI, { "USI", "h248.pkg.annexc.USI", FT_BYTES, BASE_NONE, NULL, 0, "User Service Information", HFILL }}, - + { &hf_h248_pkg_annexc_fmsdu, { "fmsdu", "h248.pkg.annexc.fmsdu", FT_BYTES, BASE_NONE, NULL, 0, - "FMSDU", HFILL }}, + NULL, HFILL }}, { &hf_h248_pkg_annexc_bmsdu, { "bmsdu", "h248.pkg.annexc.bmsdu", FT_BYTES, BASE_NONE, NULL, 0, @@ -1399,8 +1399,8 @@ void proto_register_h248_annex_c(void) { { "sscs", "h248.pkg.annexc.sscs", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - - + + { &hf_h248_pkg_annexc_sdp_v, { "sdp_v", "h248.pkg.annexc.sdp_v", FT_STRING, BASE_NONE, NULL, 0, @@ -1461,7 +1461,7 @@ void proto_register_h248_annex_c(void) { { "sdp_m", "h248.pkg.annexc.sdp_m", FT_STRING, BASE_NONE, NULL, 0, "SDP M", HFILL }}, - + { &hf_h248_pkg_annexc_olc, { "OLC", "h248.pkg.annexc.olc", FT_BYTES, BASE_NONE, NULL, 0, @@ -1486,21 +1486,21 @@ void proto_register_h248_annex_c(void) { { "CLCack", "h248.pkg.annexc.clcack", FT_BYTES, BASE_NONE, NULL, 0, "Close Logical Channel Acknowledge", HFILL }}, - + }; - + static gint *ett[] = { &ett_annexc, &ett_vpvc, &ett_codec }; - + proto_h248_pkg_annexc = proto_register_protocol(PNAME, PSNAME, PFNAME); - + proto_register_field_array(proto_h248_pkg_annexc, hf, array_length(hf)); - + proto_register_subtree_array(ett, array_length(ett)); - + h248_register_package(&h248_annexc_package); - + } diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c index 4094a044cc..b57eb28f3d 100644 --- a/epan/dissectors/packet-hclnfsd.c +++ b/epan/dissectors/packet-hclnfsd.c @@ -736,7 +736,7 @@ proto_register_hclnfsd(void) { &hf_hclnfsd_printername, { "Printer Name", "hclnfsd.printername", FT_STRING, BASE_NONE, - NULL, 0, "Printer name", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_hclnfsd_filename, { "Filename", "hclnfsd.filename", FT_STRING, BASE_NONE, diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index a500475714..a6f6c4b686 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -7,7 +7,7 @@ * Copyright (c) 2008 by Joan Ramio <joan@ramio.cat> * Joan is a masculine catalan name. Search the Internet for Joan Pujol (alias Garbo). * - * Copyright (c) 2009 by Kjell Hultman <kjell.hultman@gmail.com> + * Copyright (c) 2009 by Kjell Hultman <kjell.hultman@gmail.com> * Added dissection of signal (ASDU) information. * Kjell is also a masculine name, but a Scandinavian one. * @@ -80,7 +80,7 @@ typedef struct guint8 cp56t_dow; /* day of week */ guint8 cp56t_month; guint8 cp56t_year; - + gboolean IV; /* Invalid (1) */ @@ -89,7 +89,7 @@ typedef struct /* asdu value/status structure */ typedef struct { union { - guint8 VTI; /* Value w transient state indication, */ + guint8 VTI; /* Value w transient state indication, */ /* CP8: value I7[1..7]<-64..+63>, */ /* Transient BS1[8]<0..1>0: eq. not in transient state, 1: in trans ... */ gint16 NVA; /* Normalized value F16[1..16]<-1..+1-2^-15> */ @@ -106,7 +106,7 @@ typedef struct { gboolean OFF; gboolean ON; gboolean IPOS3; /* double-point: indeterminate state (fault?) */ - + /* quality descriptor-bits */ gboolean BL; /* Blocked (1) */ gboolean SB; /* Substituted (1) */ @@ -116,14 +116,14 @@ typedef struct { gboolean OV; /* Overflow (1) */ /* from separate quality descriptor */ gboolean EI; /* Elapsed time valid (0) / Elapsed time invalid (1) */ - + } td_ValueInfo; /* asdu command value/status structure */ typedef struct { gboolean OFF; gboolean ON; - + /* QOC qualifier-bits */ guint16 QU; /* qualifier-value */ gboolean ZeroP; /* No pulse */ @@ -137,15 +137,15 @@ typedef struct { /* asdu setpoint value/status structure */ typedef struct { - union { + union { gint16 NVA; /* Normalized value F16[1..16]<-1..+1-2^-15> */ gint16 SVA; /* Scaled value I16[1..16]<-2^15..+2^15-1> */ gfloat FLT; /* IEEE 754 float value R32.23{Fraction,Exponent,Sign} */ } SP; /* Measured Value */ - + /* QOS qualifier-bits */ guint8 QL; /* UI7[1..7]<0..127>; 0-default, 1..63-reserved for strd def., */ - /* 64..127-reserved for special use (private range) */ + /* 64..127-reserved for special use (private range) */ gboolean SE; /* Select (1) / Execute (0) */ } td_SpInfo; @@ -483,13 +483,13 @@ static gint ett_asdu = -1; /* Misc. functions for dissection of signal values */ -/* ==================================================================== +/* ==================================================================== void get_CP56Time( td_CP56Time *cp56t, tvbuff_t *tvb, guint8 offset) Dissects the CP56Time2a time (Seven octet binary time) that starts 'offset' bytes in 'tvb'. The time and date is put in struct 'cp56t' - ==================================================================== */ + ==================================================================== */ void get_CP56Time( td_CP56Time *cp56t, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint16 ms; @@ -497,7 +497,7 @@ void get_CP56Time( td_CP56Time *cp56t, tvbuff_t *tvb, guint8 *offset, proto_tree (*offset) += 2; cp56t->cp56t_s = (int)floor(ms/1000); cp56t->cp56t_ms = (int)(ms-(cp56t->cp56t_s*1000)); - + cp56t->cp56t_min = tvb_get_guint8(tvb, *offset); /* "Invalid" -- Todo: test */ cp56t->IV = cp56t->cp56t_min & 0x80; @@ -520,7 +520,7 @@ void get_CP56Time( td_CP56Time *cp56t, tvbuff_t *tvb, guint8 *offset, proto_tree if( iec104_header_tree != NULL ) { /* ---- format yy-mm-dd (dow) hh:mm:ss.ms */ - proto_tree_add_text(iec104_header_tree, tvb, (*offset)-7, 7, + proto_tree_add_text(iec104_header_tree, tvb, (*offset)-7, 7, "%.2d-%.2d-%.2d (%d) %.2d:%.2d:%.2d.%.3d (%s)", cp56t->cp56t_year,cp56t->cp56t_month,cp56t->cp56t_dom, cp56t->cp56t_dow,cp56t->cp56t_h,cp56t->cp56t_min, @@ -531,34 +531,34 @@ void get_CP56Time( td_CP56Time *cp56t, tvbuff_t *tvb, guint8 *offset, proto_tree } -/* ==================================================================== +/* ==================================================================== Information object address (Identifier) ASDU -> Inform Object #1 -> Information object address - ==================================================================== */ + ==================================================================== */ void get_InfoObjectAddress( guint32 *asdu_info_obj_addr, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* -------- Information object address */ *asdu_info_obj_addr = tvb_get_letoh24(tvb, *offset); if( iec104_header_tree != NULL ) { - proto_tree_add_uint(iec104_header_tree, hf_ioa, + proto_tree_add_uint(iec104_header_tree, hf_ioa, tvb, *offset, 3, *asdu_info_obj_addr); - + } - (*offset) += 3; + (*offset) += 3; } -/* ==================================================================== +/* ==================================================================== SIQ: Single-point information (IEV 371-02-07) w quality descriptor - ==================================================================== */ + ==================================================================== */ void get_SIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint8 siq; siq = tvb_get_guint8(tvb, *offset); - + value->ON = siq & 0x01; value->OFF = !(value->ON); value->BL = siq & 0x10; /* Blocked (1) */ @@ -569,7 +569,7 @@ void get_SIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie if( iec104_header_tree != NULL ) { proto_tree_add_text( iec104_header_tree, tvb, *offset, 1, "Value: %s - Status: %s, %s, %s, %s", - value->ON?"ON":"OFF", value->BL?"Blocked":"Not blocked", + value->ON?"ON":"OFF", value->BL?"Blocked":"Not blocked", value->SB?"Substituted":"Not Substituted", value->NT?"Not Topical":"Topical", value->IV?"Invalid":"Valid" ); } @@ -579,9 +579,9 @@ void get_SIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie } -/* ==================================================================== +/* ==================================================================== DIQ: Double-point information (IEV 371-02-08) w quality descriptor - ==================================================================== */ + ==================================================================== */ void get_DIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { @@ -613,12 +613,12 @@ void get_DIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie value->NT = diq & 0x40; /* Topical (0) / Not topical (1) */ /* [Topical <=> if most recent update was succesful] */ value->IV = diq & 0x80; /* Invalid (1) */ - + if( iec104_header_tree != NULL ) { proto_tree_add_text( iec104_header_tree, tvb, *offset, 1, "Value: %s%s%s%s - Status: %s, %s, %s, %s", - value->ON?"ON":"", value->OFF?"OFF":"", value->IPOS0?"IPOS0":"", value->IPOS3?"IPOS3":"", - value->BL?"Blocked":"Not blocked", value->SB?"Substituted":"Not Substituted", + value->ON?"ON":"", value->OFF?"OFF":"", value->IPOS0?"IPOS0":"", value->IPOS3?"IPOS3":"", + value->BL?"Blocked":"Not blocked", value->SB?"Substituted":"Not Substituted", value->NT?"Not Topical":"Topical", value->IV?"Invalid":"Valid" ); } @@ -626,9 +626,9 @@ void get_DIQ( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie } -/* ==================================================================== - QDS: Quality descriptor (separate octet) - ==================================================================== */ +/* ==================================================================== + QDS: Quality descriptor (separate octet) + ==================================================================== */ void get_QDS( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint8 qds; @@ -644,7 +644,7 @@ void get_QDS( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie if( iec104_header_tree != NULL ) { proto_tree_add_text( iec104_header_tree, tvb, *offset, 1, "Status: %s, %s, %s, %s, %s", - value->OV?"Overflow!":"No Overflow", value->BL?"Blocked!":"Not Blocked", + value->OV?"Overflow!":"No Overflow", value->BL?"Blocked!":"Not Blocked", value->SB?"Substituted!":"Not Substituted", value->NT?"Not Topical!":"Topical", value->IV?"Invalid!":"Valid" ); } @@ -653,32 +653,32 @@ void get_QDS( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie } -/* ==================================================================== +/* ==================================================================== QDP: Quality descriptor for events of protection equipment (separate octet) - ==================================================================== */ + ==================================================================== */ void get_QDP( td_ValueInfo *value _U_, tvbuff_t *tvb _U_, guint8 *offset _U_, proto_tree *iec104_header_tree _U_ ) { /* todo */ } -/* ==================================================================== +/* ==================================================================== VTI: Value with transient state indication - ==================================================================== */ + ==================================================================== */ void get_VTI( td_ValueInfo *value _U_, tvbuff_t *tvb _U_, guint8 *offset _U_, proto_tree *iec104_header_tree _U_ ) { /* todo */ } -/* ==================================================================== +/* ==================================================================== NVA: Normalized value - ==================================================================== */ + ==================================================================== */ void get_NVA( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* Normalized value F16[1..16]<-1..+1-2^-15> */ - value->MV.NVA = tvb_get_letohs(tvb, *offset); + value->MV.NVA = tvb_get_letohs(tvb, *offset); if ( iec104_header_tree != NULL ) { @@ -690,11 +690,11 @@ void get_NVA( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie } -void get_NVAspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, +void get_NVAspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* Normalized value F16[1..16]<-1..+1-2^-15> */ - spt->SP.NVA = tvb_get_letohs(tvb, *offset); + spt->SP.NVA = tvb_get_letohs(tvb, *offset); if ( iec104_header_tree != NULL ) { @@ -706,13 +706,13 @@ void get_NVAspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, } -/* ==================================================================== +/* ==================================================================== SVA: Scaled value - ==================================================================== */ + ==================================================================== */ void get_SVA( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* Scaled value I16[1..16]<-2^15..+2^15-1> */ - value->MV.SVA = tvb_get_letohs(tvb, *offset); + value->MV.SVA = tvb_get_letohs(tvb, *offset); if ( iec104_header_tree != NULL ) { proto_tree_add_int(iec104_header_tree, hf_iec104_asdunormval, @@ -722,11 +722,11 @@ void get_SVA( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *ie } -void get_SVAspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, +void get_SVAspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* Scaled value I16[1..16]<-2^15..+2^15-1> */ - spt->SP.SVA = tvb_get_letohs(tvb, *offset); + spt->SP.SVA = tvb_get_letohs(tvb, *offset); if ( iec104_header_tree != NULL ) { proto_tree_add_int(iec104_header_tree, hf_iec104_asdunormval, @@ -736,9 +736,9 @@ void get_SVAspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, } -/* ==================================================================== +/* ==================================================================== "FLT": Short floating point number - ==================================================================== */ + ==================================================================== */ void get_FLT( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { /* -------- IEEE 754 float value */ @@ -769,24 +769,24 @@ void get_FLTspt( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec1 } -/* ==================================================================== +/* ==================================================================== todo -- BCR: Binary counter reading - ==================================================================== */ -/* void get_BCR( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, + ==================================================================== */ +/* void get_BCR( td_ValueInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ); */ -/* ==================================================================== +/* ==================================================================== todo -- SEP: Single event of protection equipment - ==================================================================== */ + ==================================================================== */ void get_SEP( td_ValueInfo *value _U_, tvbuff_t *tvb _U_, guint8 *offset _U_, proto_tree *iec104_header_tree _U_ ) { /* todo */ } -/* ==================================================================== +/* ==================================================================== QOC: Qualifier Of Command - ==================================================================== */ + ==================================================================== */ void get_QOC( td_CmdInfo *value, guint8 data ) { value->ZeroP = FALSE; /* No pulse */ @@ -803,7 +803,7 @@ void get_QOC( td_CmdInfo *value, guint8 data ) value->ZeroP = TRUE; break; /* No additional definition */ case 0x01: - value->ShortP = TRUE; + value->ShortP = TRUE; break; case 0x02: value->LongP = TRUE; @@ -821,9 +821,9 @@ void get_QOC( td_CmdInfo *value, guint8 data ) } -/* ==================================================================== +/* ==================================================================== QOS: Qualifier Of Set-point command - ==================================================================== */ + ==================================================================== */ void get_QOS( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint8 qos; @@ -844,9 +844,9 @@ void get_QOS( td_SpInfo *spt, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_ } -/* ==================================================================== +/* ==================================================================== SCO: Single Command (IEV 371-03-02) - ==================================================================== */ + ==================================================================== */ void get_SCO( td_CmdInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint8 data; @@ -854,7 +854,7 @@ void get_SCO( td_CmdInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec1 data = tvb_get_guint8(tvb, *offset); value->ON = data & 0x01; value->OFF = !(value->ON); - + /* QOC */ get_QOC( value, data ); @@ -864,25 +864,25 @@ void get_SCO( td_CmdInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec1 if ( value->QU < 4 ) { proto_tree_add_text( iec104_header_tree, tvb, *offset, 1, "Command: %s%s, Qualifier: %s%s%s%s, %s", - value->ON?"ON":"", value->OFF?"OFF":"", - value->ZeroP?"No pulse defined":"", value->ShortP?"Short Pulse":"", + value->ON?"ON":"", value->OFF?"OFF":"", + value->ZeroP?"No pulse defined":"", value->ShortP?"Short Pulse":"", value->LongP?"Long Pulse":"", value->Persist?"Persistent Output":"", value->SE?"Select":"Execute"); } else { proto_tree_add_text( iec104_header_tree, tvb, *offset, 1, "Command: %s%s, Qualifier: QU=%d, %s", - value->ON?"ON":"", value->OFF?"OFF":"", + value->ON?"ON":"", value->OFF?"OFF":"", value->QU, value->SE?"Select":"Execute"); - } + } } (*offset)++; - + } -/* ==================================================================== +/* ==================================================================== DCO: Double Command (IEV 371-03-03) - ==================================================================== */ + ==================================================================== */ void get_DCO( td_CmdInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec104_header_tree ) { guint8 data; @@ -902,7 +902,7 @@ void get_DCO( td_CmdInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec1 ; break; } - + /* QOC */ get_QOC( value, data ); @@ -913,7 +913,7 @@ void get_DCO( td_CmdInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec1 { proto_tree_add_text( iec104_header_tree, tvb, *offset, 1, "Command: %s%s%s, Qualifier: %s%s%s%s, %s", value->ON?"ON":"", value->OFF?"OFF":"", (value->ON | value->OFF)?"":"Error: On/Off not defined", - value->ZeroP?"No pulse defined":"", value->ShortP?"Short Pulse":"", + value->ZeroP?"No pulse defined":"", value->ShortP?"Short Pulse":"", value->LongP?"Long Pulse":"", value->Persist?"Persistent Output":"", value->SE?"Select":"Execute"); } else { @@ -921,7 +921,7 @@ void get_DCO( td_CmdInfo *value, tvbuff_t *tvb, guint8 *offset, proto_tree *iec1 value->ON?"ON":"", value->OFF?"OFF":"", (value->ON | value->OFF)?"":"Error: On/Off not defined", value->QU, value->SE?"Select":"Execute"); - } + } } (*offset)++; @@ -959,8 +959,8 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr emem_strbuf_t * res; proto_item * it104 = NULL; proto_tree * trHead; - - + + guint8 offset = 0; /* byte offset, signal dissection */ guint8 offset_start_ioa = 0; /* position first ioa */ guint8 i; @@ -971,7 +971,7 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr td_CmdInfo cmd; /* command value struct */ td_SpInfo spt; /* setpoint value struct */ td_CP56Time cp56t; /* time value struct */ - + if (!(check_col(pinfo->cinfo, COL_INFO) || tree)) return; /* Be sure that the function is only called twice */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "104asdu"); @@ -1046,41 +1046,41 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_uint(trHead, hf_addr, tvb, 4, 2, asduh->AddrLow+ 256* asduh->AddrHigh); proto_tree_add_uint(trHead, hf_ioa, tvb, 6, 3, asduh->IOA); if (asduh->NumIx > 1) proto_tree_add_boolean(trHead, hf_sq, tvb, 1, 1, asduh->SQ); - + /* 'Signal Details': TREE */ offset = 6; /* offset position after DUI, already stored in asduh struct */ /* -------- get signal value and status based on ASDU type id */ - + switch (asduh->TypeId) { case M_SP_NA_1: case M_DP_NA_1: - case M_SP_TB_1: - case M_DP_TB_1: - case M_ME_NA_1: - case M_ME_NB_1: + case M_SP_TB_1: + case M_DP_TB_1: + case M_ME_NA_1: + case M_ME_NB_1: case M_ME_NC_1: - case M_ME_ND_1: - case M_ME_TD_1: - case M_ME_TE_1: - case M_ME_TF_1: + case M_ME_ND_1: + case M_ME_TD_1: + case M_ME_TE_1: + case M_ME_TF_1: case C_SC_NA_1: case C_DC_NA_1: - case C_SE_NA_1: - case C_SE_NB_1: - case C_SE_NC_1: - case C_SC_TA_1: - case C_DC_TA_1: - case C_SE_TA_1: - case C_SE_TB_1: - case C_SE_TC_1: - case C_CS_NA_1: - + case C_SE_NA_1: + case C_SE_NB_1: + case C_SE_NC_1: + case C_SC_TA_1: + case C_DC_TA_1: + case C_SE_TA_1: + case C_SE_TB_1: + case C_SE_TC_1: + case C_CS_NA_1: + /* create subtree for the signal values ... */ itSignal = proto_tree_add_item( trHead, proto_iec104asdu, tvb, offset, -1, FALSE ); proto_item_append_text(itSignal, ": Value"); - + trSignal = proto_item_add_subtree( itSignal, ett_asdu ); - + /* -- object values */ for(i = 0; i < asduh->NumIx; i++) { @@ -1090,8 +1090,8 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr offset_start_ioa = offset; /* -------- Information object address */ asdu_info_obj_addr = asduh->IOA; - proto_tree_add_uint(trSignal, hf_ioa, - tvb, offset_start_ioa, 3, asdu_info_obj_addr); + proto_tree_add_uint(trSignal, hf_ioa, + tvb, offset_start_ioa, 3, asdu_info_obj_addr); /* check length */ if( Len < (guint)(offset+3) ) { proto_tree_add_text( trSignal, tvb, offset, 1, "<ERR Short Asdu>" ); @@ -1103,9 +1103,9 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (asduh->SQ) /* <=> SQ=1, info obj addr = startaddr++ */ { asdu_info_obj_addr++; - proto_tree_add_uint(trSignal, hf_ioa, - tvb, offset_start_ioa, 3, asdu_info_obj_addr); - + proto_tree_add_uint(trSignal, hf_ioa, + tvb, offset_start_ioa, 3, asdu_info_obj_addr); + } else { /* SQ=0, info obj addr given */ /* -------- Information object address */ @@ -1114,9 +1114,9 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_text( trSignal, tvb, offset, 1, "<ERR Short Asdu>" ); return; } - get_InfoObjectAddress( &asdu_info_obj_addr, tvb, &offset, + get_InfoObjectAddress( &asdu_info_obj_addr, tvb, &offset, trSignal); - + } } @@ -1280,7 +1280,7 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } get_DCO( &cmd, tvb, &offset, trSignal ); get_CP56Time( &cp56t, tvb, &offset, trSignal ); - break; + break; case C_SE_TA_1: /* 61 Set point command, normalized value with time tag CP56Time2a */ /* check length */ if( Len < (guint)(offset+10) ) { @@ -1465,7 +1465,7 @@ static void dissect_iec104apci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr static void dissect_iec104reas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - /* 5th parameter = 6 = minimum bytes received to calculate the length. + /* 5th parameter = 6 = minimum bytes received to calculate the length. * (Not 2 in order to find more APCIs in case of 'noisy' bytes between the APCIs) */ tcp_dissect_pdus(tvb, pinfo, tree, TRUE, APCI_LEN, @@ -1555,11 +1555,11 @@ proto_register_iec104asdu(void) { &hf_iec104_asdufloat, { "Object value", "iec104.asdu_float", FT_FLOAT, BASE_NONE, NULL, 0x0, - "Object value", HFILL }}, + NULL, HFILL }}, { &hf_iec104_asdunormval, { "Object value", "iec104.asdu_asdunormval", FT_INT16, BASE_DEC, NULL, 0x0, - "Object value", HFILL }}, + NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 9b1c45d24c..b54c547cff 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -10136,7 +10136,7 @@ proto_register_ieee80211 (void) {&hf_fc_flags, {"Protocol Flags", "wlan.flags", FT_UINT8, BASE_HEX, NULL, 0, - "Protocol flags", HFILL }}, + NULL, HFILL }}, {&hf_fc_data_ds, {"DS status", "wlan.fc.ds", FT_UINT8, BASE_HEX, VALS (&tofrom_ds), (FLAG_FROM_DS|FLAG_TO_DS), @@ -10502,7 +10502,7 @@ proto_register_ieee80211 (void) {&hf_mesh_flags, {"Mesh Flags", "wlan.mesh.flags", FT_BOOLEAN, BASE_NONE, NULL, 0x0, - "Mesh flags", HFILL }}, + NULL, HFILL }}, {&hf_mesh_seq, {"Mesh Seq", "wlan.mesh.seq", FT_UINT32, BASE_DEC, NULL, 0, @@ -10510,7 +10510,7 @@ proto_register_ieee80211 (void) {&hf_mesh_ttl, {"Mesh TTL", "wlan.mesh.ttl", FT_UINT8, BASE_DEC, NULL, 0, - "Mesh TTL", HFILL }}, + NULL, HFILL }}, {&hf_mesh_ae1, {"Mesh A4", "wlan.mesh.a4", FT_ETHER, BASE_NONE, NULL, 0, @@ -11663,7 +11663,7 @@ proto_register_ieee80211 (void) {&ff_mesh_mgt_dest_flags, {"Destination Flags", "wlan.preq.dest_flags", - FT_UINT8, BASE_HEX, NULL, 0, "Destination Flags", HFILL }}, + FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, {&ff_mesh_mgt_dest_do_flags, {"Destination Flags", "wlan.preq.dest_flags.do", @@ -11677,7 +11677,7 @@ proto_register_ieee80211 (void) {&ff_mesh_mgt_srccount, {"Source Count", "wlan.mesh.srccount", - FT_UINT8, BASE_DEC, NULL, 0, "Source Count", HFILL }}, + FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, #endif /* MESH_OVERRIDES */ {&hf_ieee80211_ff_qos_action_code, @@ -11710,7 +11710,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_sta_address, {"STA Address", "wlan_mgt.fixed.sta_address", - FT_ETHER, BASE_NONE, NULL, 0, "STA address", HFILL }}, + FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }}, {&hf_ieee80211_ff_target_ap_address, {"Target AP Address", "wlan_mgt.fixed.target_ap_address", diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c index 8a64c26638..ebab14b89a 100644 --- a/epan/dissectors/packet-ieee8021ah.c +++ b/epan/dissectors/packet-ieee8021ah.c @@ -38,7 +38,7 @@ #include <epan/prefs.h> void proto_reg_handoff_ieee8021ah(void); -void dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo, +void dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parent, int tree_index); /* GLOBALS ************************************************************/ @@ -87,23 +87,23 @@ capture_ieee8021ah(const guchar *pd, int offset, int len, packet_counts *ld) } encap_proto = pntohs( &pd[offset + IEEE8021AH_LEN - 2] ); if (encap_proto <= IEEE_802_3_MAX_LEN) { - if ( pd[offset + IEEE8021AH_LEN] == 0xff + if ( pd[offset + IEEE8021AH_LEN] == 0xff && pd[offset + IEEE8021AH_LEN + 1] == 0xff ) { capture_ipx(ld); - } + } else { capture_llc(pd, offset + IEEE8021AH_LEN,len,ld); } - } + } else { capture_ethertype(encap_proto, pd, offset + IEEE8021AH_LEN, len, ld); } } /* Dissector *************************************************************/ -static +static void -dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo, +dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *ptree = NULL; @@ -115,7 +115,7 @@ dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo, int proto_tree_index; tvbuff_t *volatile next_tvb = NULL; - /* set tree index */ + /* set tree index */ proto_tree_index = proto_ieee8021ad; /* add info to column display */ @@ -125,7 +125,7 @@ dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo, tci = tvb_get_ntohs( tvb, 0 ); if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, + col_add_fstr(pinfo->cinfo, COL_INFO, "PRI: %d DROP: %d ID: %d", (tci >> 13), ((tci >> 12) & 1), (tci & 0xFFF)); } @@ -148,7 +148,7 @@ dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo, ieee8021ad_tag_tree = proto_item_add_subtree(tagtree, ett_ieee8021ad); /* add fields */ - proto_tree_add_uint(ieee8021ad_tag_tree, hf_ieee8021ad_priority, tvb, + proto_tree_add_uint(ieee8021ad_tag_tree, hf_ieee8021ad_priority, tvb, 0, 1, tci); proto_tree_add_uint(ieee8021ad_tag_tree, hf_ieee8021ad_cfi, tvb, 0, 1, tci); proto_tree_add_uint(ieee8021ad_tag_tree, hf_ieee8021ad_id, tvb, 0, 2, tci); @@ -176,15 +176,15 @@ dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo, if (tree) { /* add fields */ - proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_priority, tvb, + proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_priority, tvb, 0, 1, tci); proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_cfi, tvb, 0, 1, tci); proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_svid, tvb, 0, 2, tci); - proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_priority, tvb, + proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_priority, tvb, IEEE8021AD_LEN, 1, ctci); proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_cfi, tvb, IEEE8021AD_LEN, 1, ctci); - proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_cvid, tvb, IEEE8021AD_LEN, + proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_cvid, tvb, IEEE8021AD_LEN, 2, ctci); } @@ -200,7 +200,7 @@ dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo, /* Something else (shouldn't really happen, but we'll support it anyways) */ if (tree) { /* add fields */ - proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_priority, tvb, + proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_priority, tvb, 0, 1, tci); proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_cfi, tvb, 0, 1, tci); proto_tree_add_uint(ieee8021ad_tree, hf_ieee8021ad_id, tvb, 0, 2, tci); @@ -217,7 +217,7 @@ dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo, } void -dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo, +dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parent, int tree_index) { guint32 tci; guint16 encap_proto; @@ -231,7 +231,7 @@ dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo, tci = tvb_get_ntohl( tvb, 0 ); if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, + col_add_fstr(pinfo->cinfo, COL_INFO, "PRI: %d Drop: %d NCA: %d Res1: %d Res2: %d I-SID: %d", (tci >> 29), ((tci >> 28) & 1), ((tci >> 27) & 1), ((tci >> 26) & 1), ((tci >> 24) & 3), tci & IEEE8021AH_ISIDMASK); @@ -247,7 +247,7 @@ dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo, ieee8021ah_tag_tree = proto_item_add_subtree(ptree, ett_ieee8021ah); /* add fields */ - proto_tree_add_uint(ieee8021ah_tag_tree, hf_ieee8021ah_priority, tvb, + proto_tree_add_uint(ieee8021ah_tag_tree, hf_ieee8021ah_priority, tvb, 0, 1, tci); proto_tree_add_uint(ieee8021ah_tag_tree, hf_ieee8021ah_drop, tvb, 0, 1, tci); proto_tree_add_uint(ieee8021ah_tag_tree, hf_ieee8021ah_nca, tvb, 0, 1, tci); @@ -265,16 +265,16 @@ dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo, dst_addr = tvb_get_ptr(tvb, 4, 6); /* safe to use this function? */ src_addr = tvb_get_ptr(tvb, 10, 6); - addr_item = proto_tree_add_ether(tree, hf_ieee8021ah_c_daddr, + addr_item = proto_tree_add_ether(tree, hf_ieee8021ah_c_daddr, tvb, 4, 6, dst_addr); - addr_item = proto_tree_add_ether(tree, hf_ieee8021ah_c_saddr, + addr_item = proto_tree_add_ether(tree, hf_ieee8021ah_c_saddr, tvb, 10, 6, src_addr); /* add text to 802.1ad label */ if (parent) { - proto_item_append_text(tree, ", I-SID: %d, C-Src: %s (%s), C-Dst: %s (%s)", - tci & IEEE8021AH_ISIDMASK, get_ether_name(src_addr), + proto_item_append_text(tree, ", I-SID: %d, C-Src: %s (%s), C-Dst: %s (%s)", + tci & IEEE8021AH_ISIDMASK, get_ether_name(src_addr), ether_to_str(src_addr), get_ether_name(dst_addr), ether_to_str(dst_addr)); } @@ -299,7 +299,7 @@ dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo, static void -dissect_ieee8021ah(tvbuff_t *tvb, packet_info *pinfo, +dissect_ieee8021ah(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *ptree; @@ -307,7 +307,7 @@ dissect_ieee8021ah(tvbuff_t *tvb, packet_info *pinfo, proto_tree *volatile ieee8021ah_tree; int proto_tree_index; - /* set tree index */ + /* set tree index */ proto_tree_index = proto_ieee8021ah; /* add info to column display */ @@ -317,7 +317,7 @@ dissect_ieee8021ah(tvbuff_t *tvb, packet_info *pinfo, tci = tvb_get_ntohl( tvb, 0 ); if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, + col_add_fstr(pinfo->cinfo, COL_INFO, "PRI: %d Drop: %d NCA: %d Res1: %d Res2: %d I-SID: %d", (tci >> 29), ((tci >> 28) & 1), ((tci >> 27) & 1), ((tci >> 26) & 1), ((tci >> 24) & 3), (tci & 0x00FFFFFF)); @@ -345,7 +345,7 @@ proto_register_ieee8021ah(void) 0, 0xE0000000, NULL, HFILL }}, { &hf_ieee8021ah_drop, { "DROP", "ieee8021ah.drop", FT_UINT32, BASE_DEC, - 0, 0x10000000, "Drop", HFILL }}, + 0, 0x10000000, NULL, HFILL }}, { &hf_ieee8021ah_nca, { "NCA", "ieee8021ah.nca", FT_UINT32, BASE_DEC, 0, 0x08000000, "No Customer Addresses", HFILL }}, @@ -415,7 +415,7 @@ proto_register_ieee8021ah(void) proto_register_subtree_array(ett, array_length(ett)); /* add a user preference to set the 802.1ah ethertype */ - ieee8021ah_module = prefs_register_protocol(proto_ieee8021ah, + ieee8021ah_module = prefs_register_protocol(proto_ieee8021ah, proto_reg_handoff_ieee8021ah); prefs_register_uint_preference(ieee8021ah_module, "8021ah_ethertype", "802.1ah Ethertype (in hex)", @@ -432,8 +432,8 @@ proto_reg_handoff_ieee8021ah(void) if (!prefs_initialized){ dissector_handle_t ieee8021ad_handle; - ieee8021ah_handle = create_dissector_handle(dissect_ieee8021ah, - proto_ieee8021ah); + ieee8021ah_handle = create_dissector_handle(dissect_ieee8021ah, + proto_ieee8021ah); ieee8021ad_handle = create_dissector_handle(dissect_ieee8021ad, proto_ieee8021ad); dissector_add("ethertype", ETHERTYPE_IEEE_802_1AD, ieee8021ad_handle); diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index 533252cb33..bf0662c6d2 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -151,7 +151,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off type = tvb_get_guint8(tvb, offset); if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, + col_add_str(pinfo->cinfo, COL_INFO, val_to_str(type, igap_types, "Unknown Type: 0x%02x")); } proto_tree_add_uint(tree, hf_type, tvb, offset, 1, type); @@ -168,7 +168,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off proto_tree_add_item(tree, hf_maddr, tvb, offset, 4, FALSE); offset += 4; - proto_tree_add_uint(tree, hf_version, tvb, offset, 1, + proto_tree_add_uint(tree, hf_version, tvb, offset, 1, tvb_get_guint8(tvb, offset)); offset += 1; @@ -310,7 +310,7 @@ proto_register_igap(void) { &hf_account, { "User Account", "igap.account", FT_STRING, BASE_NONE, - NULL, 0, "User account", HFILL } + NULL, 0, NULL, HFILL } } }; diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index ed05e9da92..91639cf4c6 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -15,12 +15,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -68,7 +68,7 @@ get_ipdc_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) { /* lower 10 bits only */ guint raw_len = (tvb_get_ntohs(tvb,offset+2) & 0x03FF); - + return raw_len + 4; } @@ -211,7 +211,7 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* unsigned integers, or bytes */ case IPDC_UINT: case IPDC_BYTE: - for (i = 0; i < len; i++) + for (i = 0; i < len; i++) tmp_tag += tvb_get_guint8(tvb, offset + 2 + i) * (guint32) pow(256, len - (i + 1)); @@ -286,7 +286,7 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) status = tvb_get_guint8(tvb,offset+2+i); proto_tree_add_text(tag_tree, tvb, - offset + 2 + i, 1, + offset + 2 + i, 1, " %.2u: %.2x (%s)", i + 1, status, val_to_str(status, @@ -318,7 +318,7 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_get_guint8(tvb,offset+3)); } break; - + /* default */ default: proto_tree_add_text(tag_tree, tvb, offset, @@ -345,7 +345,7 @@ dissect_ipdc_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_ipdc(void) -{ +{ static hf_register_info hf[] = { { &hf_ipdc_nr, @@ -356,7 +356,7 @@ proto_register_ipdc(void) { &hf_ipdc_ns, { "N(s)", "ipdc.ns", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "Transmit sequence number", HFILL } }, @@ -387,7 +387,7 @@ proto_register_ipdc(void) { &hf_ipdc_message_code, { "Message code", "ipdc.message_code", FT_UINT16, BASE_HEX, VALS(message_code_vals), 0x0, - "Message Code", HFILL } + NULL, HFILL } }, }; @@ -425,7 +425,7 @@ proto_reg_handoff_ipdc(void) dissector_delete("tcp.port", last_ipdc_port_pref, ipdc_tcp_handle); } else { - ipdc_tcp_handle = + ipdc_tcp_handle = create_dissector_handle(dissect_ipdc_tcp, proto_ipdc); q931_handle = find_dissector("q931"); } diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index 779f2776b3..7363a5e577 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -377,7 +377,7 @@ proto_register_isl(void) "Route descriptor to be used for source learning", HFILL }}, { &hf_isl_fcs_not_incl, { "FCS Not Included", "isl.fcs_not_incl", FT_BOOLEAN, 9, - NULL, 0x40, "FCS not included", HFILL }}, + NULL, 0x40, NULL, HFILL }}, { &hf_isl_esize, { "Esize", "isl.esize", FT_UINT8, BASE_DEC, NULL, 0x3F, "Frame size for frames less than 64 bytes", HFILL }}, diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 5a508de458..e0d5cc8551 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -1702,7 +1702,7 @@ void proto_register_isns(void) { &hf_isns_virtual_fabric_id, { "Virtual Fabric ID","isns.virtual_fabric_id", FT_STRING, BASE_NONE, NULL, 0x0, - "Virtual fabric ID", HFILL }}, + NULL, HFILL }}, { &hf_isns_proxy_iscsi_name, { "Proxy iSCSI Name","isns.proxy_iscsi_name", diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index 99a5c78fdb..edad1792b1 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -1,39 +1,39 @@ -/* packet-iwarp-ddp-rdmap.c +/* packet-iwarp-ddp-rdmap.c * Routines for Direct Data Placement (DDP) and * Remote Direct Memory Access Protocol (RDMAP) dissection - * According to IETF RFC 5041 and RFC 5040 - * Copyright 2008, Yves Geissbuehler <yves.geissbuehler@gmx.net> - * Copyright 2008, Philip Frey <frey.philip@gmail.com> - * - * $Id$ - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * Copyright 1998 Gerald Combs - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * According to IETF RFC 5041 and RFC 5040 + * Copyright 2008, Yves Geissbuehler <yves.geissbuehler@gmx.net> + * Copyright 2008, Philip Frey <frey.philip@gmail.com> + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* INCLUDES */ -#ifdef HAVE_CONFIG_H -# include "config.h" +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#include <stdlib.h> -#include <glib.h> -#include <epan/packet.h> +#include <stdlib.h> +#include <glib.h> +#include <epan/packet.h> /* DEFINES */ @@ -133,7 +133,7 @@ static gint ett_iwarp_ddp_control_field = -1; static gint ett_iwarp_ddp_tagged_header = -1; static gint ett_iwarp_ddp_untagged_header = -1; -/* +/* * RDMAP: initialize the protocol and registered fields */ static gint hf_iwarp_rdma = -1; @@ -253,12 +253,12 @@ static const value_string ddp_errcode_untagged_names[] = { { 0x04, "Invalid MO" }, { 0x05, "DDP Message too long for available buffer" }, { 0x06, "Invalid DDP version" }, - { 0, NULL } + { 0, NULL } }; /* update packet list pane in the GUI */ void -ddp_rdma_packetlist(packet_info *pinfo, gboolean ddp_last_flag, +ddp_rdma_packetlist(packet_info *pinfo, gboolean ddp_last_flag, guint8 rdma_msg_opcode) { const gchar *ddp_fragment_state; @@ -286,17 +286,17 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, proto_tree *rdma_header_tree = NULL; proto_tree *term_ctrl_field_tree = NULL; proto_tree *header_ctrl_field_tree = NULL; - + proto_item *rdma_header_subitem = NULL; proto_item *term_ctrl_field_subitem = NULL; proto_item *header_ctrl_field_subitem = NULL; guint8 layer, etype, hdrct; - + guint32 rdmardsz; if (rdma_tree) { - + if (rdma_msg_opcode == RDMA_READ_REQUEST) { rdma_header_subitem = proto_tree_add_item(rdma_tree, hf_iwarp_rdma_rr_header, tvb, offset, -1, FALSE); @@ -309,13 +309,13 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_sinkto, tvb, offset, RDMA_SINKTO_LEN, FALSE); offset += RDMA_SINKTO_LEN; - + rdmardsz = (guint32) tvb_get_ntohl(tvb, offset); proto_tree_add_uint_format_value(rdma_header_tree, hf_iwarp_rdma_rdmardsz, tvb, offset, RDMA_RDMARDSZ_LEN, rdmardsz, "%u bytes", rdmardsz); - + offset += RDMA_RDMARDSZ_LEN; proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_srcstag, tvb, offset, RDMA_SRCSTAG_LEN, FALSE); @@ -405,9 +405,9 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, offset, 1, FALSE); header_ctrl_field_tree = proto_item_add_subtree( header_ctrl_field_subitem, ett_iwarp_rdma); - + hdrct = tvb_get_guint8(tvb, offset) & IWARP_HDRCT; - + proto_tree_add_item(header_ctrl_field_tree, hf_iwarp_rdma_term_hdrct_m, tvb, offset, 1, FALSE); proto_tree_add_item(header_ctrl_field_tree, @@ -419,14 +419,14 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, offset, 2, FALSE); offset += 2; - + if (hdrct & IWARP_HDRCT_D) { /* DDP Segment Length (if any) */ proto_tree_add_item(rdma_header_tree, hf_iwarp_rdma_term_ddp_seg_len, tvb, offset, RDMA_DDP_SEGLEN_LEN, FALSE); offset += RDMA_DDP_SEGLEN_LEN; - + /* Terminated DDP Header (if any), tagged or untagged */ if (etype == IWARP_ETYPE_DDP_TAGGED) { proto_tree_add_item(rdma_header_tree, @@ -450,7 +450,7 @@ dissect_iwarp_rdmap(tvbuff_t *tvb, proto_tree *rdma_tree, guint32 offset, } } -/* +/* * Main dissection routine which dissects a DDP segment and interprets the * header field rsvdULP according to RDMAP. */ @@ -472,7 +472,7 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *rdma_ctrl_field_item = NULL; tvbuff_t *next_tvb = NULL; - + gboolean is_tagged_buffer_model; guint8 ddp_ctrl_field, rdma_ctrl_field, rdma_msg_opcode; guint32 header_end; @@ -484,30 +484,30 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) is_tagged_buffer_model = ddp_ctrl_field & DDP_TAGGED_FLAG; ddp_rdma_packetlist(pinfo, ddp_ctrl_field & DDP_LAST_FLAG, rdma_msg_opcode); - + if (tree) { - + offset = 0; - + /* determine header length */ if (is_tagged_buffer_model) { header_end = DDP_TAGGED_HEADER_LEN; } else { header_end = DDP_UNTAGGED_HEADER_LEN; } - + if (rdma_msg_opcode == RDMA_READ_REQUEST || rdma_msg_opcode == RDMA_TERMINATE) { header_end = -1; } - + /* DDP/RDMA protocol tree */ ddp_rdma_item = proto_tree_add_item(tree, proto_iwarp_ddp_rdmap, tvb, offset, header_end, FALSE); ddp_rdma_tree = proto_item_add_subtree(ddp_rdma_item, ett_iwarp_ddp_rdmap); - /* DDP protocol header subtree */ + /* DDP protocol header subtree */ ddp_item = proto_tree_add_item(ddp_rdma_tree, hf_iwarp_ddp, tvb, offset, header_end, FALSE); ddp_tree = proto_item_add_subtree(ddp_item, ett_iwarp_ddp); @@ -518,7 +518,7 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) DDP_CONTROL_FIELD_LEN, FALSE); ddp_ctrl_field_tree = proto_item_add_subtree(ddp_ctrl_field_item, ett_iwarp_ddp); - + proto_tree_add_item(ddp_ctrl_field_tree, hf_iwarp_ddp_t_flag, tvb, offset, DDP_CONTROL_FIELD_LEN, FALSE); proto_tree_add_item(ddp_ctrl_field_tree, hf_iwarp_ddp_l_flag, tvb, @@ -528,21 +528,21 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ddp_ctrl_field_tree, hf_iwarp_ddp_dv, tvb, offset, DDP_CONTROL_FIELD_LEN, FALSE); offset += DDP_CONTROL_FIELD_LEN; - - + + /* DDP header field RsvdULP */ if (!is_tagged_buffer_model) { proto_tree_add_item(ddp_tree, hf_iwarp_ddp_rsvdulp, tvb, offset, DDP_UNTAGGED_RSVDULP_LEN, FALSE); } - + /* RDMA protocol header subtree */ if (is_tagged_buffer_model) { header_end = RDMA_CONTROL_FIELD_LEN; } else { header_end = RDMA_CONTROL_FIELD_LEN + RDMA_RESERVED_FIELD_LEN; } - + rdma_item = proto_tree_add_item(ddp_rdma_tree, hf_iwarp_rdma, tvb, offset, header_end, FALSE); rdma_tree = proto_item_add_subtree(rdma_item, ett_iwarp_rdma); @@ -553,7 +553,7 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) RDMA_CONTROL_FIELD_LEN, FALSE); rdma_ctrl_field_tree = proto_item_add_subtree(rdma_ctrl_field_item, ett_iwarp_rdma); - + proto_tree_add_item(rdma_ctrl_field_tree, hf_iwarp_rdma_version, tvb, offset, RDMA_CONTROL_FIELD_LEN, FALSE); proto_tree_add_item(rdma_ctrl_field_tree, hf_iwarp_rdma_rsvd, tvb, @@ -561,7 +561,7 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(rdma_ctrl_field_tree, hf_iwarp_rdma_opcode, tvb, offset, RDMA_CONTROL_FIELD_LEN, FALSE); offset += RDMA_CONTROL_FIELD_LEN; - + /* dissection of DDP rsvdULP[8:39] with respect to RDMAP */ if (rdma_msg_opcode == RDMA_READ_REQUEST || rdma_msg_opcode == RDMA_SEND @@ -570,13 +570,13 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(rdma_tree, hf_iwarp_rdma_reserved, tvb, offset, RDMA_RESERVED_FIELD_LEN, FALSE); } - + if (rdma_msg_opcode == RDMA_SEND_INVALIDATE || rdma_msg_opcode == RDMA_SEND_SE_INVALIDATE) { proto_tree_add_item(rdma_tree, hf_iwarp_rdma_inval_stag, tvb, offset, RDMA_INVAL_STAG_LEN, FALSE); } - + if (!is_tagged_buffer_model) { offset += RDMA_RESERVED_FIELD_LEN; } @@ -597,17 +597,17 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ddp_buffer_model_tree, hf_iwarp_ddp_to, tvb, offset, DDP_TO_LEN, FALSE); offset += DDP_TO_LEN; - + if( rdma_msg_opcode == RDMA_READ_RESPONSE || rdma_msg_opcode == RDMA_WRITE) { - + /* display the payload */ next_tvb = tvb_new_subset_remaining(tvb, DDP_TAGGED_HEADER_LEN); call_dissector(data_handle, next_tvb, pinfo, tree); } - + } else { - + /* Untagged Buffer Model Case */ ddp_buffer_model_item = proto_tree_add_item(ddp_tree, hf_iwarp_ddp_untagged_header, tvb, offset, @@ -624,7 +624,7 @@ dissect_iwarp_ddp_rdmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ddp_buffer_model_tree, hf_iwarp_ddp_mo, tvb, offset, DDP_MO_LEN, FALSE); offset += DDP_MO_LEN; - + if (rdma_msg_opcode == RDMA_SEND || rdma_msg_opcode == RDMA_SEND_INVALIDATE || rdma_msg_opcode == RDMA_SEND_SE @@ -659,7 +659,7 @@ proto_register_iwarp_ddp_rdmap(void) { &hf_iwarp_ddp_control_field, { "DDP control field", "iwarp_ddp.control_field", FT_NONE, BASE_NONE, NULL, 0x0, - "DDP Control Field", HFILL } }, + NULL, HFILL } }, { &hf_iwarp_ddp_tagged_header, { "Tagged buffer model", "iwarp_ddp.tagged", FT_NONE, BASE_NONE, NULL, 0x0, @@ -852,17 +852,17 @@ proto_register_iwarp_ddp_rdmap(void) static gint *ett[] = { &ett_iwarp_ddp_rdmap, - + /* DDP */ &ett_iwarp_ddp, &ett_iwarp_ddp_control_field, &ett_iwarp_ddp_tagged_header, &ett_iwarp_ddp_untagged_header, - + /* RDMAP */ &ett_iwarp_rdma, - + &ett_iwarp_rdma_control_field, &ett_iwarp_rdma_rr_header, &ett_iwarp_rdma_terminate_header, diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index d63cab3029..6db4d8d1b9 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -4831,7 +4831,7 @@ proto_register_kerberos(void) NULL, 0, "Transited Contents string", HFILL }}, { &hf_krb_keytype, { "Key type", "kerberos.keytype", FT_UINT32, BASE_DEC, - VALS(krb5_encryption_types), 0, "Key Type", HFILL }}, + VALS(krb5_encryption_types), 0, NULL, HFILL }}, { &hf_krb_keyvalue, { "Key value", "kerberos.keyvalue", FT_BYTES, BASE_NONE, NULL, 0, "Key value (encryption key)", HFILL }}, @@ -4849,7 +4849,7 @@ proto_register_kerberos(void) NULL, 0, "IF_RELEVANT Data", HFILL }}, { &hf_krb_etype, { "Encryption type", "kerberos.etype", FT_INT32, BASE_DEC, - VALS(krb5_encryption_types), 0, "Encryption Type", HFILL }}, + VALS(krb5_encryption_types), 0, NULL, HFILL }}, { &hf_krb_addr_type, { "Addr-type", "kerberos.addr_type", FT_UINT32, BASE_DEC, VALS(krb5_address_types), 0, "Address Type", HFILL }}, @@ -5347,7 +5347,7 @@ proto_register_kerberos(void) VALS(NT_errors), 0, "NT Status code", HFILL }}, { &hf_krb_smb_unknown, { "Unknown", "kerberos.smb.unknown", FT_UINT32, BASE_HEX, - NULL, 0, "unknown", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_krb_midl_blob_len, { "Blob Length", "kerberos.midl_blob_len", FT_UINT64, BASE_DEC, NULL, 0, "Length of NDR encoded data that follows", HFILL }}, diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index 6608984f6d..4ed8a46bf7 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -267,10 +267,10 @@ dissect_krb4_auth_msg_type(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t proto_tree_add_item(tree, hf_krb4_m_type, tvb, offset, 1, FALSE); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, "%s%s", - (version==TRANSARC_SPECIAL_VERSION)?"TRANSARC-":"", + (version==TRANSARC_SPECIAL_VERSION)?"TRANSARC-":"", val_to_str(auth_msg_type>>1, m_type_vals, "Unknown (0x%04x)")); - proto_item_append_text(item, " %s%s", - (version==TRANSARC_SPECIAL_VERSION)?"TRANSARC-":"", + proto_item_append_text(item, " %s%s", + (version==TRANSARC_SPECIAL_VERSION)?"TRANSARC-":"", val_to_str(auth_msg_type>>1, m_type_vals, "Unknown (0x%04x)")); /* byte order */ @@ -288,12 +288,12 @@ dissect_krb4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) proto_item *item; guint8 version, opcode; int offset=0; - + /* this should better have the value 4 or it might be a weirdo * Transarc AFS special unknown thing. */ version=tvb_get_guint8(tvb, offset); - if((version!=4)&&(version!=TRANSARC_SPECIAL_VERSION)){ + if((version!=4)&&(version!=TRANSARC_SPECIAL_VERSION)){ return FALSE; } @@ -316,7 +316,7 @@ dissect_krb4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* create a tree for krb4 */ item = proto_tree_add_item(parent_tree, proto_krb4, tvb, offset, -1, FALSE); tree = proto_item_add_subtree(item, ett_krb4); - + col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB4"); col_clear(pinfo->cinfo, COL_INFO); @@ -423,7 +423,7 @@ proto_register_krb4(void) { &hf_krb4_ticket_blob, { "Ticket Blob", "krb4.ticket.blob", FT_BYTES, BASE_NONE, NULL, 0x00, - "Ticket blob", HFILL }}, + NULL, HFILL }}, { &hf_krb4_request_blob, { "Request Blob", "krb4.request.blob", FT_BYTES, BASE_NONE, NULL, 0x00, @@ -431,7 +431,7 @@ proto_register_krb4(void) { &hf_krb4_encrypted_blob, { "Encrypted Blob", "krb4.encrypted_blob", FT_BYTES, BASE_NONE, NULL, 0x00, - "Encrypted blob", HFILL }}, + NULL, HFILL }}, { &hf_krb4_unknown_transarc_blob, { "Unknown Transarc Blob", "krb4.unknown_transarc_blob", FT_BYTES, BASE_NONE, NULL, 0x00, diff --git a/epan/dissectors/packet-klm.c b/epan/dissectors/packet-klm.c index da23fcce3b..570b4f8508 100644 --- a/epan/dissectors/packet-klm.c +++ b/epan/dissectors/packet-klm.c @@ -217,7 +217,7 @@ proto_register_klm(void) { &hf_klm_servername, { "server name", "klm.servername", FT_STRING, BASE_NONE, - NULL, 0, "Server name", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_klm_pid, { "pid", "klm.pid", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c index 04f9d65e82..193f1cfd4c 100644 --- a/epan/dissectors/packet-lanforge.c +++ b/epan/dissectors/packet-lanforge.c @@ -248,7 +248,7 @@ void proto_register_lanforge(void) { "Timestamp Secs", "LANforge.ts-secs", FT_UINT32, BASE_DEC, NULL, 0x0, - "Timestamp secs", HFILL + NULL, HFILL } }, diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c index b5db50c200..a56ae360b0 100644 --- a/epan/dissectors/packet-lapb.c +++ b/epan/dissectors/packet-lapb.c @@ -170,7 +170,7 @@ proto_register_lapb(void) { &hf_lapb_control, { "Control Field", "lapb.control", FT_UINT8, BASE_HEX, NULL, 0x0, - "Control field", HFILL }}, + NULL, HFILL }}, { &hf_lapb_n_r, { "N(R)", "lapb.control.n_r", FT_UINT8, BASE_DEC, diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index c3eabe8a0e..0c25fb96d2 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -34,7 +34,7 @@ * http://www.acacia-net.com/Clarinet/Protocol/q9213o84.htm * http://www.itu.int/rec/T-REC-Q.921/en * Base Station Controller - Base Transceiver Station (BSC - BTS) interface; Layer 2 specification - * http://www.3gpp.org/ftp/Specs/html-info/48056.htm + * http://www.3gpp.org/ftp/Specs/html-info/48056.htm */ #ifdef HAVE_CONFIG_H @@ -151,7 +151,7 @@ static const xdlc_cf_items lapd_cf_items_ext = { }; -/* LAPD frame detection state */ +/* LAPD frame detection state */ enum lapd_bitstream_states {OUT_OF_SYNC, FLAGS, DATA}; typedef struct lapd_byte_state { @@ -210,7 +210,7 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint offset = 0, last_packet_end_offset = 0, available; guint8 *buff; tvbuff_t *new_tvb; - + enum lapd_bitstream_states state = OUT_OF_SYNC; lapd_ppi_t *lapd_ppi; conversation_t *conversation = NULL; @@ -230,7 +230,7 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bit_offset = prev_byte_state->bit_offset; ones = prev_byte_state->ones; } - + } else if (conversation) { convo_data = (lapd_convo_data_t*)conversation_get_proto_data(conversation, proto_lapd); if (NULL != convo_data) { @@ -306,7 +306,7 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bit_offset--; } break; - + case FLAGS: if (full_byte == 0x7E) { /* we have a flag byte */ full_byte = 0x00; @@ -318,7 +318,7 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bit_offset = 0; } break; - + case DATA: /* we got a new data byte */ new_byte(full_byte, data, &data_len); @@ -343,14 +343,14 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) fill_lapd_byte_state(&lapd_ppi->start_byte_state, prev_byte_state->state, prev_byte_state->full_byte, prev_byte_state->bit_offset, prev_byte_state->ones); - else + else fill_lapd_byte_state(&lapd_ppi->start_byte_state, OUT_OF_SYNC, 0x00, 0, 0); p_add_proto_data(pinfo->fd, proto_lapd, lapd_ppi); - - + + /* Conversation info*/ - + if (conversation) { if (convo_data) { /* already have lapd convo data */ if (forward_stream) @@ -502,14 +502,14 @@ dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (NULL != p_get_proto_data(pinfo->fd, proto_lapd) && ((lapd_ppi_t*)p_get_proto_data(pinfo->fd, proto_lapd))->has_crc) { - + /* check checksum */ checksum_offset = tvb_length(tvb) - 2; checksum = tvb_get_guint8(tvb, checksum_offset); /* high byte */ checksum <<= 8; checksum |= tvb_get_guint8(tvb, checksum_offset+1) & 0x00FF; /* low byte */ checksum_calculated = g_htons(crc16_ccitt_tvb(tvb, tvb_length(tvb) - 2)); - + if (checksum == checksum_calculated) { checksum_ti = proto_tree_add_uint_format(lapd_tree, hf_lapd_checksum, tvb, checksum_offset, 2, 0,"Checksum: 0x%04x [correct]", checksum); checksum_tree = proto_item_add_subtree(checksum_ti, ett_lapd_checksum); @@ -521,10 +521,10 @@ dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_boolean(checksum_tree, hf_lapd_checksum_good, tvb, checksum_offset, 2, FALSE); proto_tree_add_boolean(checksum_tree, hf_lapd_checksum_bad, tvb, checksum_offset, 2, TRUE); } - + next_tvb = tvb_new_subset(tvb, lapd_header_len, tvb_length_remaining(tvb,lapd_header_len) - 2, -1); - - } else + + } else next_tvb = tvb_new_subset_remaining(tvb, lapd_header_len); if (XDLC_IS_INFORMATION(control)) { @@ -584,7 +584,7 @@ proto_register_lapd(void) { &hf_lapd_control, { "Control Field", "lapd.control", FT_UINT16, BASE_HEX, NULL, 0x0, - "Control field", HFILL }}, + NULL, HFILL }}, { &hf_lapd_n_r, { "N(R)", "lapd.control.n_r", FT_UINT16, BASE_DEC, @@ -635,11 +635,11 @@ proto_register_lapd(void) VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }}, { &hf_lapd_checksum, - { "Checksum", "lapd.checksum", FT_UINT16, BASE_HEX, + { "Checksum", "lapd.checksum", FT_UINT16, BASE_HEX, NULL, 0x0, "Details at: http://www.wireshark.org/docs/wsug_html_chunked/ChAdvChecksums.html", HFILL }}, { &hf_lapd_checksum_good, - { "Good Checksum", "lapd.checksum_good", FT_BOOLEAN, BASE_NONE, + { "Good Checksum", "lapd.checksum_good", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "True: checksum matches packet content; False: doesn't match content or not checked", HFILL }}, { &hf_lapd_checksum_bad, diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c index 2a5d937dc1..dbeac85f97 100644 --- a/epan/dissectors/packet-lapdm.c +++ b/epan/dissectors/packet-lapdm.c @@ -320,7 +320,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - /* Now reset fragmentation information in pinfo + /* Now reset fragmentation information in pinfo */ pinfo->fragmented = save_fragmented; } @@ -362,7 +362,7 @@ proto_register_lapdm(void) { &hf_lapdm_control, { "Control Field", "lapdm.control_field", FT_UINT8, BASE_HEX, NULL, 0x0, - "Control field", HFILL }}, + NULL, HFILL }}, { &hf_lapdm_n_r, { "N(R)", "lapdm.control.n_r", FT_UINT8, BASE_DEC, @@ -402,7 +402,7 @@ proto_register_lapdm(void) { &hf_lapdm_length, { "Length Field", "lapdm.length_field", FT_UINT8, BASE_HEX, - NULL, 0x0, "Length field", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_lapdm_el, { "EL", "lapdm.el", FT_UINT8, BASE_DEC, diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c index 6c48969a1e..24d0ccd277 100644 --- a/epan/dissectors/packet-lmi.c +++ b/epan/dissectors/packet-lmi.c @@ -197,7 +197,7 @@ proto_register_lmi(void) static hf_register_info hf[] = { { &hf_lmi_call_ref, { "Call reference", "lmi.cmd", FT_UINT8, BASE_HEX, NULL, 0, - "Call Reference", HFILL }}, + NULL, HFILL }}, { &hf_lmi_msg_type, { "Message Type", "lmi.msg_type", FT_UINT8, BASE_HEX, VALS(msg_type_str), 0, diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index c3bc8614a7..43e767bbb2 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -3287,7 +3287,7 @@ void proto_register_mac_lte(void) { &hf_mac_lte_context_rach_attempt_number, { "RACH Attempt Number", "mac-lte.preamble-sent.attempt", FT_UINT8, BASE_DEC, 0, 0x0, - "RACH attempt number", HFILL + NULL, HFILL } }, diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index b16131419e..04e15724f3 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -257,7 +257,7 @@ add_rr_to_tree(proto_item *trr, int rr_type, tvbuff_t *tvb, int offset, guint ttl, gushort data_len) { proto_tree *rr_tree; - + rr_tree = proto_item_add_subtree(trr, rr_type); proto_tree_add_text(rr_tree, tvb, offset+1, namelen-1, "Name: %s", name); offset += namelen; @@ -376,7 +376,7 @@ get_nbns_name_type_class(tvbuff_t *tvb, int offset, int nbns_data_offset, int type; int class; - name_len = get_nbns_name(tvb, offset, nbns_data_offset, name_ret, + name_len = get_nbns_name(tvb, offset, nbns_data_offset, name_ret, *name_len_ret, name_type_ret); offset += name_len; @@ -628,7 +628,7 @@ dissect_nbns_answer(tvbuff_t *tvb, int offset, int nbns_data_offset, proto_item *trr; char *name_str; guint num_names; - char *nbname; + char *nbname; gushort name_flags; data_start = data_offset = offset; @@ -1716,13 +1716,13 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (length == 0) goto continuation; - /* - * I added this IF test to catch issues when the dissector loses track of the stream normally - * because of missing frames in the capture and the first byte of the TCP data being check - * happens to be a 0. I'm adding a second sanity test to try to reject false positives. - * I've haven't seen any real world CIFS/SMB traffic where the NBSS PDU length is greater then - * 65536 bytes. I could have added this with an OR argument to the previous IF test but I added it - * this way for clarity. - Frank Schorr */ + /* + * I added this IF test to catch issues when the dissector loses track of the stream normally + * because of missing frames in the capture and the first byte of the TCP data being check + * happens to be a 0. I'm adding a second sanity test to try to reject false positives. + * I've haven't seen any real world CIFS/SMB traffic where the NBSS PDU length is greater then + * 65536 bytes. I could have added this with an OR argument to the previous IF test but I added it + * this way for clarity. - Frank Schorr */ if (length > 65536) goto continuation; break; @@ -1908,7 +1908,7 @@ proto_register_nbt(void) { &hf_nbdgm_node_type, { "Node Type", "nbdgm.node_type", FT_UINT8, BASE_DEC, VALS(node_type_vals), 0x0, - "Node type", HFILL }}, + NULL, HFILL }}, { &hf_nbdgm_datagram_id, { "Datagram ID", "nbdgm.dgram_id", FT_UINT16, BASE_HEX, NULL, 0x0, @@ -1920,7 +1920,7 @@ proto_register_nbt(void) { &hf_nbdgm_src_port, { "Source Port", "nbdgm.src.port", FT_UINT16, BASE_DEC, NULL, 0x0, - "Source port", HFILL }} + NULL, HFILL }} }; static hf_register_info hf_nbss[] = { diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 902dfd6b4e..4aea1f4296 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -6092,7 +6092,7 @@ proto_register_netflow(void) {&hf_cflow_unknown_field_type, {"Unknown Field Type", "cflow.unknown_field_type", FT_BYTES, BASE_NONE, NULL, 0x0, - "Unknown Field Type", HFILL} + NULL, HFILL} }, {&hf_cflow_template_ipfix_total_field_count, {"Total Field Count", "cflow.template_ipfix_total_field_count", diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 1cbc0f6768..bb022c1627 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -11519,7 +11519,7 @@ proto_register_nfs(void) { &hf_nfs_dtime, { "time delta", "nfs.dtime", FT_RELATIVE_TIME, BASE_NONE, - NULL, 0, "Time Delta", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_nfs_dtime_sec, { "seconds", "nfs.dtime.sec", FT_UINT32, BASE_DEC, @@ -11575,7 +11575,7 @@ proto_register_nfs(void) { &hf_nfs_stateid4_hash, { "StateID Hash", "nfs.stateid4.hash", FT_UINT16, BASE_HEX, - NULL, 0, "StateID Hash", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_nfs_acl4, { "ACL", "nfs.acl", FT_NONE, BASE_NONE, diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c index e0637c8343..5753db545d 100644 --- a/epan/dissectors/packet-nisplus.c +++ b/epan/dissectors/packet-nisplus.c @@ -1630,7 +1630,7 @@ proto_register_nis(void) { &hf_nisplus_table_col_name, { "column name", "nisplus.table.col.name", FT_STRING, BASE_NONE, - NULL, 0, "Column Name", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_nisplus_table_col_mask, { "flags", "nisplus.table.col.flags", FT_NONE, BASE_NONE, @@ -1705,7 +1705,7 @@ proto_register_nis(void) { &hf_nisplus_cookie, { "cookie", "nisplus.cookie", FT_BYTES, BASE_NONE, - NULL, 0, "Cookie", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_nisplus_fd_dirname, { "dirname", "nisplus.fd.dirname", FT_STRING, BASE_NONE, @@ -1721,7 +1721,7 @@ proto_register_nis(void) { &hf_nisplus_tag, { "tag", "nisplus.tag", FT_NONE, BASE_NONE, - NULL, 0, "Tag", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_nisplus_tag_type, { "type", "nisplus.tag.type", FT_UINT32, BASE_DEC, @@ -1765,11 +1765,11 @@ proto_register_nis(void) { &hf_nisplus_log_entries, { "log entries", "nisplus.log.entries", FT_NONE, BASE_NONE, - NULL, 0, "Log Entries", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_nisplus_log_entry, { "log entry", "nisplus.log.entry", FT_NONE, BASE_NONE, - NULL, 0, "Log Entry", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_nisplus_log_time, { "time", "nisplus.log.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c index 913c4413cb..3c40b867e5 100644 --- a/epan/dissectors/packet-nsrp.c +++ b/epan/dissectors/packet-nsrp.c @@ -25,15 +25,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* +/* * * NSRP update information can be found at www.juniper.net * * - * + * * NSRP Packet Header is defined as follow: - * - * 1 2 3 4 5 6 7 8 + * + * 1 2 3 4 5 6 7 8 * +--------+--------+--------+--------+--------+--------+--------+--------+ * |Version | Type |Clust ID|MSG Flag| Length |HA Port |Not Used| * +--------+--------+--------+--------+--------+--------+--------+--------+ @@ -163,27 +163,27 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_item(tree, proto_nsrp, tvb, 0, -1, FALSE); nsrp_tree = proto_item_add_subtree(ti, ett_nsrp); - - + + proto_tree_add_item(nsrp_tree, hf_nsrp_version, tvb, offset, 1, FALSE); offset += 1; msgtype = tvb_get_guint8(tvb, offset); proto_tree_add_item(nsrp_tree, hf_nsrp_msg_type, tvb, offset, 1, FALSE); offset += 1; - + proto_tree_add_item(nsrp_tree, hf_nsrp_clust_id, tvb, offset, 1, FALSE); offset += 1; - + proto_tree_add_item(nsrp_tree, hf_nsrp_msg_flag, tvb, offset, 1, FALSE); offset += 1; proto_tree_add_item(nsrp_tree, hf_nsrp_len, tvb, offset, 2, FALSE); offset += 2; - + proto_tree_add_item(nsrp_tree, hf_nsrp_ha_port, tvb, offset, 1, FALSE); offset += 1; - + proto_tree_add_item(nsrp_tree, hf_nsrp_not_used, tvb, offset, 1, FALSE); offset += 1; @@ -193,13 +193,13 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(nsrp_tree, hf_nsrp_src_unit, tvb, offset, 4, FALSE); offset += 4; } - + /* * * * NSRP HA Packet is defined as follow: - * - * 1 2 3 4 5 6 7 8 + * + * 1 2 3 4 5 6 7 8 * +--------+--------+--------+--------+--------+--------+--------+--------+ * | Type |WstGroup|HstGroup|MSG Flag| Length |Enc Flag|Not Used| * +--------+--------+--------+--------+--------+--------+--------+--------+ @@ -212,7 +212,7 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if ( msgtype == 0x00 ) { - + proto_tree_add_item(nsrp_tree, hf_nsrp_msgtype, tvb, offset, 1, FALSE); offset += 1; @@ -224,10 +224,10 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(nsrp_tree, hf_nsrp_msgflag, tvb, offset, 1, FALSE); offset += 1; - + proto_tree_add_item(nsrp_tree, hf_nsrp_msglen, tvb, offset, 2, FALSE); offset += 2; - + proto_tree_add_item(nsrp_tree, hf_nsrp_encflag, tvb, offset, 1, FALSE); offset += 1; @@ -236,39 +236,39 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(nsrp_tree, hf_nsrp_total_size, tvb, offset, 4, FALSE); offset += 4; - + proto_tree_add_item(nsrp_tree, hf_nsrp_ns, tvb, offset, 2, FALSE); offset += 2; - + proto_tree_add_item(nsrp_tree, hf_nsrp_nr, tvb, offset, 2, FALSE); offset += 2; proto_tree_add_item(nsrp_tree, hf_nsrp_no_used, tvb, offset, 2, FALSE); offset += 2; - + proto_tree_add_item(nsrp_tree, hf_nsrp_checksum, tvb, offset, 2, FALSE); offset += 2; - + proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, FALSE); - + } - + /* - * + * * NSRP MNG Packet is defined as follow: - * - * 1 2 3 4 5 6 7 8 + * + * 1 2 3 4 5 6 7 8 * +--------+--------+--------+--------+--------+--------+--------+--------+ * | Type |WstGroup|HstGroup|MSG Flag| Length |AuthFlag|Not Used| * +--------+--------+--------+--------+--------+--------+--------+--------+ * |Priority+ Dummy + Auth CheckSum + Data | * +--------+--------+--------+--------+-----------------------------------+ - * + * * */ if ( msgtype == 0x02 ) { - + proto_tree_add_item(nsrp_tree, hf_nsrp_msgtype, tvb, offset, 1, FALSE); offset += 1; @@ -280,10 +280,10 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(nsrp_tree, hf_nsrp_msgflag, tvb, offset, 1, FALSE); offset += 1; - + proto_tree_add_item(nsrp_tree, hf_nsrp_msglen, tvb, offset, 2, FALSE); offset += 2; - + proto_tree_add_item(nsrp_tree, hf_nsrp_authflag, tvb, offset, 1, FALSE); offset += 1; @@ -292,24 +292,24 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(nsrp_tree, hf_nsrp_priority, tvb, offset, 1, FALSE); offset += 1; - + proto_tree_add_item(nsrp_tree, hf_nsrp_dummy, tvb, offset, 1, FALSE); offset += 1; - + proto_tree_add_item(nsrp_tree, hf_nsrp_authchecksum, tvb, offset, 2, FALSE); offset += 2; proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, FALSE); - + } - - - - -/* + + + + +/* * NSRP DATA Packet is defined as follow: - * - * 1 2 3 4 5 6 7 8 + * + * 1 2 3 4 5 6 7 8 * +--------+--------+--------+--------+--------+--------+--------+--------+ * | Type |WstGroup|HstGroup|MSG Flag| Length | Ifnum |Not Used| * +--------+--------+--------+--------+--------+--------+--------+--------+ @@ -319,7 +319,7 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * */ if ( msgtype == 0x03 ) { - + proto_tree_add_item(nsrp_tree, hf_nsrp_msgtype, tvb, offset, 1, FALSE); offset += 1; @@ -331,10 +331,10 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(nsrp_tree, hf_nsrp_msgflag, tvb, offset, 1, FALSE); offset += 1; - + proto_tree_add_item(nsrp_tree, hf_nsrp_msglen, tvb, offset, 2, FALSE); offset += 2; - + proto_tree_add_item(nsrp_tree, hf_nsrp_ifnum, tvb, offset, 1, FALSE); offset += 1; @@ -343,9 +343,9 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(nsrp_tree, hf_nsrp_total_size, tvb, offset, 4, FALSE); offset += 4; - + proto_tree_add_item(nsrp_tree, hf_nsrp_data, tvb, offset, -1, FALSE); - + } } @@ -389,7 +389,7 @@ proto_register_nsrp(void) { &hf_nsrp_not_used, { "Not used", "nsrp.notused", FT_UINT8, BASE_DEC, NULL, 0, - "NOT USED", HFILL } + NULL, HFILL } }, { &hf_nsrp_dst_unit, { "Destination", "nsrp.dst", @@ -426,7 +426,7 @@ proto_register_nsrp(void) FT_UINT16, BASE_DEC, NULL, 0, "NSRP MESSAGE LENGTH", HFILL } }, - + { &hf_nsrp_encflag, { "Enc Flag", "nsrp.encflag", FT_UINT8, BASE_DEC, VALS(nsrp_encflag_vals), 0, @@ -435,7 +435,7 @@ proto_register_nsrp(void) { &hf_nsrp_notused, { "Not Used", "nsrp.notused", FT_UINT8, BASE_DEC, NULL, 0, - "NOT USED", HFILL } + NULL, HFILL } }, { &hf_nsrp_total_size, { "Total Size", "nsrp.totalsize", @@ -455,7 +455,7 @@ proto_register_nsrp(void) { &hf_nsrp_no_used, { "Reserved", "nsrp.reserved", FT_UINT16, BASE_DEC, NULL, 0, - "RESERVED", HFILL } + NULL, HFILL } }, { &hf_nsrp_checksum, { "Checksum", "nsrp.checksum", diff --git a/epan/dissectors/packet-nwmtp.c b/epan/dissectors/packet-nwmtp.c index 0093462362..abb2da4821 100644 --- a/epan/dissectors/packet-nwmtp.c +++ b/epan/dissectors/packet-nwmtp.c @@ -99,7 +99,7 @@ static void dissect_nwmtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) next_tvb = tvb_new_subset(tvb, offset + 12, len, len); call_dissector(mtp_handle, next_tvb, pinfo, tree); - offset += len + 12; + offset += len + 12; } } @@ -119,7 +119,7 @@ void proto_register_mwmtp(void) {&hf_nwmtp_data_index, {"Link Index", "nwmtp.link_index", FT_UINT16, BASE_DEC, NULL, 0x0, - "Link Index", HFILL} + NULL, HFILL} }, {&hf_nwmtp_user_context, {"User Context", "nwmtp.user_context", diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c index 43f779496a..b7a90b3064 100644 --- a/epan/dissectors/packet-pagp.c +++ b/epan/dissectors/packet-pagp.c @@ -442,12 +442,12 @@ proto_register_pagp(void) { &hf_pagp_local_device_id, { "Local Device ID", "pagp.localdevid", FT_ETHER, BASE_NONE, NULL, 0x0, - "Local device ID", HFILL }}, + NULL, HFILL }}, { &hf_pagp_local_learn_cap, { "Local Learn Capability", "pagp.localearncap", FT_UINT8, BASE_HEX, VALS(learn_cap), 0x0, - "Local learn capability", HFILL }}, + NULL, HFILL }}, { &hf_pagp_local_port_priority, { "Local Port Hot Standby Priority", "pagp.localportpri", @@ -502,7 +502,7 @@ proto_register_pagp(void) { &hf_pagp_partner_count, { "Partner Count", "pagp.partnercount", FT_UINT16, BASE_DEC, NULL, 0x0, - "Partner count", HFILL }}, + NULL, HFILL }}, { &hf_pagp_num_tlvs, { "Number of TLVs", "pagp.numtlvs", @@ -532,7 +532,7 @@ proto_register_pagp(void) { &hf_pagp_flush_local_device_id, { "Flush Local Device ID", "pagp.flushlocaldevid", FT_ETHER, BASE_NONE, NULL, 0x0, - "Flush local device ID", HFILL }}, + NULL, HFILL }}, { &hf_pagp_flush_partner_device_id, { "Flush Partner Device ID", "pagp.flushpartnerdevid", diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 3c6a3ef6e2..a98dc84532 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -1403,7 +1403,7 @@ static gboolean dissect_pdcp_lte_heur(tvbuff_t *tvb, packet_info *pinfo, } /* Do this again on re-dissection to re-discover offset of actual PDU */ - + /* Needs to be at least as long as: - the signature string - fixed header bytes @@ -1681,8 +1681,8 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree bitmap_ti = proto_tree_add_item(pdcp_tree, hf_pdcp_lte_bitmap, tvb, offset, -1, FALSE); bitmap_tree = proto_item_add_subtree(bitmap_ti, ett_pdcp_rohc_report_bitmap); - - + + /* For each byte... */ for ( ; tvb_length_remaining(tvb, offset); offset++) { guint bit_offset = 0; @@ -1899,7 +1899,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree return; } - return; + return; } } @@ -2068,7 +2068,7 @@ void proto_register_pdcp(void) { &hf_pdcp_lte_data_control, { "PDU Type", "pdcp-lte.pdu-type", FT_UINT8, BASE_HEX, VALS(pdu_type_vals), 0x80, - "PDU type", HFILL + NULL, HFILL } }, { &hf_pdcp_lte_user_plane_data, diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index 92f13e2bbc..0ae42cd528 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -1071,7 +1071,7 @@ guint dissect_rdt_transport_info_response_packet(tvbuff_t *tvb, packet_info *pin guint8 is_delayed; guint8 has_buffer_info; guint32 request_time_msec; - guint32 response_time_msec; + guint32 response_time_msec; proto_tree *flags_tree; proto_item *ti; @@ -1108,25 +1108,25 @@ guint dissect_rdt_transport_info_response_packet(tvbuff_t *tvb, packet_info *pin request_time_msec = tvb_get_ntohl(tvb, offset); proto_tree_add_item(tree, hf_rdt_tirp_request_time_msec, tvb, offset, 4, FALSE); offset += 4; - + if (is_delayed) { response_time_msec = tvb_get_ntohl(tvb, offset); proto_tree_add_item(tree, hf_rdt_tirp_response_time_msec, tvb, offset, 4, FALSE); - offset += 4; + offset += 4; } } - + /* Buffer info */ if (has_buffer_info) { guint16 n; - + /* Read number of buffers */ guint16 buffer_info_count = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_rdt_tirp_buffer_info_count, tvb, offset, 2, FALSE); offset += 2; - + for (n=0; n < buffer_info_count; n++) { proto_tree *buffer_info_tree; @@ -1150,7 +1150,7 @@ guint dissect_rdt_transport_info_response_packet(tvbuff_t *tvb, packet_info *pin offset += 4; } } - + /* Report what is left */ offset += tvb_length_remaining(tvb, offset); @@ -1549,7 +1549,7 @@ void proto_register_rdt(void) BASE_NONE, NULL, 0x0, - "RDT RTT request flags", HFILL + NULL, HFILL } }, { @@ -1561,7 +1561,7 @@ void proto_register_rdt(void) BASE_NONE, NULL, 0x0, - "RDT RTT response flags", HFILL + NULL, HFILL } }, { diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c index 748c1b1c9b..f38cc8cc26 100644 --- a/epan/dissectors/packet-rip.c +++ b/epan/dissectors/packet-rip.c @@ -338,7 +338,7 @@ proto_register_rip(void) { &hf_rip_family, { "Address Family", "rip.family", FT_UINT16, BASE_DEC, - VALS(family_vals), 0, "Address family", HFILL }}, + VALS(family_vals), 0, NULL, HFILL }}, { &hf_rip_routing_domain, { "Routing Domain", "rip.routing_domain", FT_UINT16, BASE_DEC, diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 3b3a79cc62..fce5c69b36 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -305,12 +305,12 @@ dissect_rpcap_error (tvbuff_t *tvb, packet_info *pinfo, gint len; len = tvb_length_remaining (tvb, offset); - + if (check_col (pinfo->cinfo, COL_INFO)) { col_append_fstr (pinfo->cinfo, COL_INFO, ": %s", tvb_format_text_wsp (tvb, offset, len)); } - + ti = proto_tree_add_item (parent_tree, hf_error, tvb, offset, len, FALSE); expert_add_info_format (pinfo, ti, PI_SEQUENCE, PI_NOTE, "Error: %s", tvb_format_text_wsp (tvb, offset, len)); @@ -424,7 +424,7 @@ dissect_rpcap_findalldevs_if (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item (tree, hf_if_name, tvb, offset, namelen, FALSE); offset += namelen; } - + if (desclen) { proto_tree_add_item (tree, hf_if_desc, tvb, offset, desclen, FALSE); offset += desclen; @@ -433,7 +433,7 @@ dissect_rpcap_findalldevs_if (tvbuff_t *tvb, packet_info *pinfo _U_, for (i = 0; i < naddr; i++) { offset = dissect_rpcap_findalldevs_ifaddr (tvb, pinfo, tree, offset); } - + proto_item_set_len (ti, offset - boffset); return offset; @@ -447,7 +447,7 @@ dissect_rpcap_findalldevs_reply (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree; proto_item *ti; guint16 i; - + ti = proto_tree_add_item (parent_tree, hf_findalldevs_reply, tvb, offset, -1, FALSE); tree = proto_item_add_subtree (ti, ett_findalldevs_reply); @@ -532,11 +532,11 @@ dissect_rpcap_auth_request (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item (tree, hf_dummy, tvb, offset, 2, FALSE); offset += 2; - + slen1 = tvb_get_ntohs (tvb, offset); proto_tree_add_item (tree, hf_auth_slen1, tvb, offset, 2, FALSE); offset += 2; - + slen2 = tvb_get_ntohs (tvb, offset); proto_tree_add_item (tree, hf_auth_slen2, tvb, offset, 2, FALSE); offset += 2; @@ -545,18 +545,18 @@ dissect_rpcap_auth_request (tvbuff_t *tvb, packet_info *pinfo _U_, proto_item_append_text (ti, " (none)"); } else if (type == RPCAP_RMTAUTH_PWD) { guint8 *username, *password; - + username = tvb_get_ephemeral_string (tvb, offset, slen1); proto_tree_add_item (tree, hf_auth_username, tvb, offset, slen1, FALSE); offset += slen1; - + password = tvb_get_ephemeral_string (tvb, offset, slen2); proto_tree_add_item (tree, hf_auth_password, tvb, offset, slen2, FALSE); offset += slen2; proto_item_append_text (ti, " (%s/%s)", username, password); } - + return offset; } @@ -660,7 +660,7 @@ dissect_rpcap_startcap_reply (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item (tree, hf_server_port, tvb, offset, 2, FALSE); offset += 2; - + proto_tree_add_item (tree, hf_dummy, tvb, offset, 2, FALSE); offset += 2; @@ -733,7 +733,7 @@ dissect_rpcap_sampling_request (tvbuff_t *tvb, packet_info *pinfo _U_, default: break; } - + return offset; } @@ -747,7 +747,7 @@ dissect_rpcap_packet (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree, nstime_t ts; tvbuff_t *new_tvb; gint caplen, frame_no; - + ti = proto_tree_add_item (parent_tree, hf_packet, tvb, offset, 20, FALSE); tree = proto_item_add_subtree (ti, ett_packet); @@ -791,7 +791,7 @@ dissect_rpcap_packet (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree, call_dissector (data_handle, new_tvb, pinfo, top_tree); } offset += caplen; - + return offset; } @@ -828,7 +828,7 @@ dissect_rpcap (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree) } proto_item_append_text (ti, ", %s", val_to_str (msg_type, message_type, "Unknown: %d")); - + msg_value = tvb_get_ntohs (tvb, offset); if (msg_type == RPCAP_MSG_ERROR) { proto_tree_add_item (tree, hf_error_value, tvb, offset, 2, FALSE); @@ -901,7 +901,7 @@ check_rpcap_heur (tvbuff_t *tvb, gboolean tcp) if (tvb_length (tvb) < 8) /* Too short */ return FALSE; - + version = tvb_get_guint8 (tvb, offset); if (version != 0) /* Incorrect version */ @@ -933,9 +933,9 @@ check_rpcap_heur (tvbuff_t *tvb, gboolean tcp) plen = tvb_get_ntohl (tvb, offset); offset += 4; len = (guint32) tvb_length_remaining (tvb, offset); - + switch (msg_type) { - + case RPCAP_MSG_FINDALLIF_REQ: case RPCAP_MSG_UPDATEFILTER_REPLY: case RPCAP_MSG_AUTH_REPLY: @@ -948,7 +948,7 @@ check_rpcap_heur (tvbuff_t *tvb, gboolean tcp) if (plen != 0 || len != 0) return FALSE; break; - + case RPCAP_MSG_OPEN_REPLY: case RPCAP_MSG_STARTCAP_REPLY: case RPCAP_MSG_SETSAMPLING_REQ: @@ -956,19 +956,19 @@ check_rpcap_heur (tvbuff_t *tvb, gboolean tcp) if (plen != 8 || len != 8) return FALSE; break; - + case RPCAP_MSG_STATS_REPLY: /* Always 16 bytes */ if (plen != 16 || len != 16) return FALSE; break; - + case RPCAP_MSG_PACKET: /* Must have the frame header */ if (plen < 20) return FALSE; break; - + case RPCAP_MSG_FINDALLIF_REPLY: /* May be empty */ break; @@ -1002,9 +1002,9 @@ dissect_rpcap_heur_tcp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (check_rpcap_heur (tvb, TRUE)) { /* This is probably a rpcap tcp package */ - tcp_dissect_pdus (tvb, pinfo, tree, rpcap_desegment, 8, + tcp_dissect_pdus (tvb, pinfo, tree, rpcap_desegment, 8, get_rpcap_pdu_len, dissect_rpcap); - + return TRUE; } @@ -1018,7 +1018,7 @@ dissect_rpcap_heur_udp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_rpcap_heur (tvb, FALSE)) { /* This is probably a rpcap udp package */ dissect_rpcap (tvb, pinfo, tree); - + return TRUE; } @@ -1051,7 +1051,7 @@ proto_register_rpcap (void) { &hf_error_value, { "Error value", "rpcap.error_value", FT_UINT16, BASE_DEC, VALS(error_codes), 0x0, NULL, HFILL } }, - + /* Packet header */ { &hf_packet, { "Packet", "rpcap.packet", FT_NONE, BASE_NONE, @@ -1088,12 +1088,12 @@ proto_register_rpcap (void) { &hf_auth_password, { "Password", "rpcap.password", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - + /* Open request */ { &hf_open_request, { "Open request", "rpcap.open_request", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - + /* Open reply */ { &hf_open_reply, { "Open reply", "rpcap.open_reply", FT_NONE, BASE_NONE, @@ -1140,7 +1140,7 @@ proto_register_rpcap (void) /* Start capture reply */ { &hf_startcap_reply, { "Start capture reply", "rpcap.startcap_reply", FT_NONE, BASE_NONE, - NULL, 0x0, "Start Capture Reply", HFILL } }, + NULL, 0x0, NULL, HFILL } }, { &hf_bufsize, { "Buffer size", "rpcap.bufsize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, @@ -1295,10 +1295,10 @@ proto_register_rpcap (void) proto_rpcap = proto_register_protocol (PNAME, PSNAME, PFNAME); register_dissector (PFNAME, dissect_rpcap, proto_rpcap); - + proto_register_field_array (proto_rpcap, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); - + /* Register our configuration options */ rpcap_module = prefs_register_protocol (proto_rpcap, proto_reg_handoff_rpcap); @@ -1329,7 +1329,7 @@ proto_reg_handoff_rpcap (void) if (!rpcap_prefs_initialized) { data_handle = find_dissector ("data"); rpcap_prefs_initialized = TRUE; - + heur_dissector_add ("tcp", dissect_rpcap_heur_tcp, proto_rpcap); heur_dissector_add ("udp", dissect_rpcap_heur_udp, proto_rpcap); } diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index 0e2eabdc99..2186dfb35d 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -738,7 +738,7 @@ proto_register_rx(void) { &hf_rx_ticket, { "ticket", "rx.ticket", FT_BYTES, BASE_NONE, - NULL, 0, "Ticket", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_rx_ifmtu, { "Interface MTU", "rx.if_mtu", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index f528aea8b3..483016e44e 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -1200,7 +1200,7 @@ void proto_register_sasp(void) /*SASP DATA*/ { &hf_sasp, { "SASP", "sasp", FT_NONE, BASE_NONE, NULL, 0x0, - "SASP", HFILL } }, + NULL, HFILL } }, /*SASP Header */ { &hf_sasp_type, diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c index ea9d9aedd3..fe14fd2c99 100644 --- a/epan/dissectors/packet-sdlc.c +++ b/epan/dissectors/packet-sdlc.c @@ -149,7 +149,7 @@ proto_register_sdlc(void) { &hf_sdlc_control, { "Control Field", "sdlc.control", FT_UINT16, BASE_HEX, - NULL, 0x0, "Control field", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_sdlc_n_r, { "N(R)", "sdlc.control.n_r", FT_UINT8, BASE_DEC, diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 4d0f2752be..0d39dd0ff1 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -2896,7 +2896,7 @@ proto_register_sflow(void) { { &hf_sflow_245_ifindex, { "Interface index", "sflow_245.ifindex", FT_UINT32, BASE_DEC, NULL, 0x0, - "Interface Index", HFILL}}, + NULL, HFILL}}, { &hf_sflow_245_as, { "AS Router", "sflow_245.as", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -2921,7 +2921,7 @@ proto_register_sflow(void) { { &hf_sflow_245_community_entries, { "Gateway Communities", "sflow_245.communityEntries", FT_UINT32, BASE_DEC, NULL, 0x0, - "Gateway Communities", HFILL}}, + NULL, HFILL}}, { &hf_sflow_245_community, { "Gateway Community", "sflow_245.community", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -2934,19 +2934,19 @@ proto_register_sflow(void) { { &hf_sflow_245_iftype, { "Interface Type", "sflow_245.iftype", FT_UINT32, BASE_DEC, NULL, 0x0, - "Interface Type", HFILL}}, + NULL, HFILL}}, { &hf_sflow_245_ifspeed, { "Interface Speed", "sflow_245.ifspeed", FT_UINT64, BASE_DEC, NULL, 0x0, - "Interface Speed", HFILL}}, + NULL, HFILL}}, { &hf_sflow_245_ifdirection, { "Interface Direction", "sflow_245.ifdirection", FT_UINT32, BASE_DEC, NULL, 0x0, - "Interface Direction", HFILL}}, + NULL, HFILL}}, { &hf_sflow_245_ifstatus, { "Interface Status", "sflow_245.ifstatus", FT_UINT32, BASE_DEC, NULL, 0x0, - "Interface Status", HFILL}}, + NULL, HFILL}}, { &hf_sflow_245_ifinoct, { "Input Octets", "sflow_245.ifinoct", FT_UINT64, BASE_DEC, NULL, 0x0, @@ -3186,107 +3186,107 @@ proto_register_sflow(void) { { &hf_sflow_245_vlan_id, { "VLAN ID", "sflow_245.vlan_id", FT_UINT32, BASE_DEC, NULL, 0x0, - "VLAN ID", HFILL}}, + NULL, HFILL}}, { &hf_sflow_245_octets, { "Octets", "sflow_245.octets", FT_UINT64, BASE_DEC, NULL, 0x0, - "Octets", HFILL}}, + NULL, HFILL}}, { &hf_sflow_245_ucastPkts, { "Unicast Packets", "sflow_245.ucastPkts", FT_UINT32, BASE_DEC, NULL, 0x0, - "Unicast Packets", HFILL}}, + NULL, HFILL}}, { &hf_sflow_245_multicastPkts, { "Multicast Packets", "sflow_245.multicastPkts", FT_UINT32, BASE_DEC, NULL, 0x0, - "Multicast Packets", HFILL}}, + NULL, HFILL}}, { &hf_sflow_245_broadcastPkts, { "Broadcast Packets", "sflow_245.broadcastPkts", FT_UINT32, BASE_DEC, NULL, 0x0, - "Broadcast Packets", HFILL}}, + NULL, HFILL}}, { &hf_sflow_245_discards, { "Discards", "sflow_245.discards", FT_UINT32, BASE_DEC, NULL, 0x0, - "Discards", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11TransmittedFragmentCount, { "Transmitted Fragment Count", "sflow_5.dot11TransmittedFragmentCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "Transmitted Fragment Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11MulticastTransmittedFrameCount, { "Multicast Transmitted Frame Count", "sflow_5.dot11MulticastTransmittedFrameCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "Multicast Transmitted Frame Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11FailedCount, { "Failed Count", "sflow_5.dot11FailedCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "Failed Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11RetryCount, { "Retry Count", "sflow_5.dot11RetryCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "Retry Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11MultipleRetryCount, { "Multiple Retry Count", "sflow_5.dot11MultipleRetryCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "Multiple Retry Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11FrameDuplicateCount, { "Frame Duplicate Count", "sflow_5.dot11FrameDuplicateCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "Frame Duplicate Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11RTSSuccessCount, { "RTS Success Count", "sflow_5.dot11RTSSuccessCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "RTS Success Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11RTSFailureCount, { "Failure Count", "sflow_5.dot11RTSFailureCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "Failure Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11ACKFailureCount, { "ACK Failure Count", "sflow_5.dot11ACKFailureCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "ACK Failure Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11ReceivedFragmentCount, { "Received Fragment Count", "sflow_5.dot11ReceivedFragmentCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "Received Fragment Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11MulticastReceivedFrameCount, { "Multicast Received Frame Count", "sflow_5.dot11MulticastReceivedFrameCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "Multicast Received Frame Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11FCSErrorCount, { "FCS Error Count", "sflow_5.dot11FCSErrorCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "FCS Error Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11TransmittedFrameCount, { "Transmitted Frame Count", "sflow_5.dot11TransmittedFrameCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "Transmitted Frame Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11WEPUndecryptableCount, { "WEP Undecryptable Count", "sflow_5.dot11WEPUndecryptableCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "WEP Undecryptable Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11QoSDiscardedFragmentCount, { "QoS Discarded Fragment Count", "sflow_5.dot11QoSDiscardedFragmentCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "QoS Discarded Fragment Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11AssociatedStationCount, { "Associated Station Count", "sflow_5.dot11AssociatedStationCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "Associated Station Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11QoSCFPollsReceivedCount, { "QoS CF Polls Received Count", "sflow_5.dot11QoSCFPollsReceivedCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "QoS CF Polls Received Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11QoSCFPollsUnusedCount, { "QoS CF Polls Unused Count", "sflow_5.dot11QoSCFPollsUnusedCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "QoS CF Polls Unused Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11QoSCFPollsUnusableCount, { "QoS CF Polls Unusable Count", "sflow_5.dot11QoSCFPollsUnusableCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "QoS CF Polls Unusable Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_dot11QoSCFPollsLostCount, { "QoS CF Polls Lost Count", "sflow_5.dot11QoSCFPollsLostCount", FT_UINT32, BASE_DEC, NULL, 0x0, - "QoS CF Polls Lost Count", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_cpu_5s, { "5s CPU Load (100 = 1%)", "sflow_5.cpu_5s", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -3302,11 +3302,11 @@ proto_register_sflow(void) { { &hf_sflow_5_total_memory, { "Total Memory", "sflow_5.total_memory", FT_UINT64, BASE_DEC, NULL, 0x0, - "Total Memory", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_free_memory, { "Free Memory", "sflow_5.free_memory", FT_UINT64, BASE_DEC, NULL, 0x0, - "Free Memory", HFILL}}, + NULL, HFILL}}, { &hf_sflow_5_elapsed_time, { "Elapsed Time (ms)", "sflow_5.elapsed_time", FT_UINT32, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 1361bc84a7..ad6211e23c 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -4151,7 +4151,7 @@ proto_register_skinny(void) { &hf_skinny_annPlayMode, { "annPlayMode", "skinny.annPlayMode", FT_UINT32, BASE_DEC, VALS(skinny_annPlayMode), 0x0, - "AnnPlayMode", + NULL, HFILL } }, @@ -4418,7 +4418,7 @@ proto_register_skinny(void) "Whether the SCCP dissector should reassemble messages spanning multiple TCP segments." " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &skinny_desegment); - + skinny_tap = register_tap("skinny"); } diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 52e079efc0..f1da4c07e8 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -2437,7 +2437,7 @@ proto_register_slsk(void) FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_login_successful, { "Login successful", "slsk.login.successful", - FT_UINT8, BASE_DEC, NULL, 0, "Login Successful", HFILL } }, + FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_login_message, { "Login Message", "slsk.login.message", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, @@ -2449,7 +2449,7 @@ proto_register_slsk(void) FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_slsk_user_exists, { "user exists", "slsk.user.exists", - FT_UINT8, BASE_DEC, NULL, 0, "User exists", HFILL } }, + FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_slsk_status_code, { "Status Code", "slsk.status.code", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index de85aeb92f..972178efa8 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -469,7 +469,7 @@ dissect_election_criterion(tvbuff_t *tvb, proto_tree *parent_tree, int offset) */ int dissect_smb_server_type_flags(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *parent_tree, guint8 *drep, + proto_tree *parent_tree, guint8 *drep, gboolean infoflag) { proto_tree *tree = NULL; @@ -643,9 +643,9 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr /* Windows version (See "OSVERSIONINFO Structure" on MSDN) */ os_major_ver = tvb_get_guint8(tvb, offset); os_minor_ver = tvb_get_guint8(tvb, offset+1); - + SET_WINDOWS_VERSION_STRING(os_major_ver, os_minor_ver, windows_version); - + if(windows_version) proto_tree_add_text(tree, tvb, offset, 2, "Windows version: %s", windows_version); @@ -788,14 +788,14 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr /* the subcommand follows ... one of three values */ reset_cmd = tvb_get_guint8(tvb, offset); - reset_item = proto_tree_add_uint(tree, hf_mb_reset_command, tvb, + reset_item = proto_tree_add_uint(tree, hf_mb_reset_command, tvb, offset, 1, reset_cmd); sub_tree = proto_item_add_subtree(item, ett_browse_reset_cmd_flags); - proto_tree_add_boolean(sub_tree, hf_mb_reset_demote, tvb, + proto_tree_add_boolean(sub_tree, hf_mb_reset_demote, tvb, offset, 1, reset_cmd); - proto_tree_add_boolean(sub_tree, hf_mb_reset_flush, tvb, + proto_tree_add_boolean(sub_tree, hf_mb_reset_flush, tvb, offset, 1, reset_cmd); - proto_tree_add_boolean(sub_tree, hf_mb_reset_stop, tvb, + proto_tree_add_boolean(sub_tree, hf_mb_reset_stop, tvb, offset, 1, reset_cmd); offset += 1; break; @@ -950,8 +950,8 @@ proto_register_smb_browse(void) BASE_HEX, VALS(resetbrowserstate_command_names), 0, NULL, HFILL }}, { &hf_mb_reset_demote, - { "Demote LMB", "browser.reset_cmd.demote", FT_BOOLEAN, - 8, TFS(&tfs_demote_to_backup), 0x01, NULL, HFILL}}, + { "Demote LMB", "browser.reset_cmd.demote", FT_BOOLEAN, + 8, TFS(&tfs_demote_to_backup), 0x01, NULL, HFILL}}, { &hf_mb_reset_flush, { "Flush Browse List", "browser.reset_cmd.flush", FT_BOOLEAN, 8, TFS(&tfs_flush_browse_list), 0x02, NULL, HFILL}}, @@ -1156,7 +1156,7 @@ proto_register_smb_browse(void) { &hf_backup_count, { "Backup List Requested Count", "browser.backup.count", FT_UINT8, BASE_DEC, - NULL, 0, "Backup list requested count", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_backup_token, { "Backup Request Token", "browser.backup.token", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 4bda305604..6e9b21817b 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -3869,7 +3869,7 @@ proto_register_smb_pipe(void) NULL, 0, "Total number of bytes remaining in the message at the head of the pipe", HFILL }}, { &hf_pipe_peek_status, { "Pipe Status", "pipe.peek.status", FT_UINT16, BASE_DEC, - VALS(pipe_status), 0, "Pipe status", HFILL }}, + VALS(pipe_status), 0, NULL, HFILL }}, { &hf_pipe_getinfo_info_level, { "Information Level", "pipe.getinfo.info_level", FT_UINT16, BASE_DEC, NULL, 0, "Information level of information to return", HFILL }}, diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 04d0eee57f..e0e8e57ad1 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -7730,7 +7730,7 @@ dissect_tree_connect_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree idea how to dissect it. I'm guessing the third word contains connect support bits, which looks plausible from the values I've seen. */ - + /* MaximalShareAccessRights and GuestMaximalShareAccessRights */ while (wleft != 0) { /* @@ -7748,7 +7748,7 @@ dissect_tree_connect_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree "Guest Maximal Share Access Rights"); } tr = proto_item_add_subtree(it, ett_smb_nt_access_mask); - + offset = dissect_smb_access_mask(tvb, tr, offset); wleft -= 2; count++; @@ -17703,11 +17703,11 @@ proto_register_smb(void) { &hf_smb_security_blob_len, { "Security Blob Length", "smb.security_blob_len", FT_UINT16, BASE_DEC, - NULL, 0, "Security blob length", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb_security_blob, { "Security Blob", "smb.security_blob", FT_BYTES, BASE_NONE, - NULL, 0, "Security blob", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb_sm_mode16, { "Mode", "smb.sm.mode", FT_BOOLEAN, 16, @@ -18311,7 +18311,7 @@ proto_register_smb(void) { &hf_smb_resume_key_len, { "Resume Key Length", "smb.resume.key_len", FT_UINT16, BASE_DEC, - NULL, 0, "Resume Key length", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb_resume_find_id, { "Find ID", "smb.resume.find_id", FT_UINT8, BASE_HEX, @@ -18991,7 +18991,7 @@ proto_register_smb(void) { &hf_smb_root_dir_handle, { "Root Directory Handle", "smb.root_dir_handle", FT_UINT32, BASE_HEX, - NULL, 0, "Root directory handle", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb_target_name_len, { "Target name length", "smb.target_name_len", FT_UINT32, BASE_DEC, @@ -19317,7 +19317,7 @@ proto_register_smb(void) { &hf_smb_dfs_referral_number_of_expnames, { "Number of Expanded Names", "smb.dfs.referral.number_of_expnames", FT_UINT16, BASE_DEC, - NULL, 0, "Number of expanded names", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb_dfs_referral_expnames_offset, { "Expanded Names Offset", "smb.dfs.referral.expnames_offset", FT_UINT16, BASE_DEC, @@ -19357,7 +19357,7 @@ proto_register_smb(void) { &hf_smb_file_index, { "File Index", "smb.file_index", FT_UINT32, BASE_DEC, - NULL, 0, "File index", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb_short_file_name, { "Short File Name", "smb.short_file", FT_STRING, BASE_NONE, @@ -19381,7 +19381,7 @@ proto_register_smb(void) { &hf_smb_fs_sector, { "Bytes per Sector", "smb.fs_bytes_per_sector", FT_UINT32, BASE_DEC, - NULL, 0, "Bytes per sector", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb_avail_units, { "Available Units", "smb.avail.units", FT_UINT32, BASE_DEC, @@ -19389,7 +19389,7 @@ proto_register_smb(void) { &hf_smb_volume_serial_num, { "Volume Serial Number", "smb.volume.serial", FT_UINT32, BASE_HEX, - NULL, 0, "Volume serial number", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb_volume_label_len, { "Label Length", "smb.volume.label.len", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index b5ae012044..0bdf987dd6 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -5714,7 +5714,7 @@ proto_register_smb2(void) { &hf_smb2_security_blob_len, { "Security Blob Length", "smb2.security_blob_len", FT_UINT16, BASE_DEC, - NULL, 0, "Security blob length", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb2_security_blob_offset, { "Security Blob Offset", "smb2.security_blob_offset", FT_UINT16, BASE_HEX, @@ -5753,7 +5753,7 @@ proto_register_smb2(void) { &hf_smb2_infolevel, { "InfoLevel", "smb2.infolevel", FT_UINT8, BASE_HEX, - NULL, 0, "Infolevel", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb2_infolevel_file_info, { "InfoLevel", "smb2.file_info.infolevel", FT_UINT8, BASE_HEX, @@ -5789,7 +5789,7 @@ proto_register_smb2(void) { &hf_smb2_security_blob, { "Security Blob", "smb2.security_blob", FT_BYTES, BASE_NONE, - NULL, 0, "Security blob", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb2_ioctl_out_data, { "Out Data", "smb2.ioctl.out", FT_NONE, BASE_NONE, @@ -5801,11 +5801,11 @@ proto_register_smb2(void) { &hf_smb2_server_guid, { "Server Guid", "smb2.server_guid", FT_GUID, BASE_NONE, - NULL, 0, "Server GUID", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb2_client_guid, { "Client Guid", "smb2.client_guid", FT_GUID, BASE_NONE, - NULL, 0, "Client GUID", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb2_object_id, { "ObjectId", "smb2.object_id", FT_GUID, BASE_NONE, @@ -6034,7 +6034,7 @@ proto_register_smb2(void) { &hf_smb2_close_flags, { "Close Flags", "smb2.close.flags", FT_UINT16, BASE_HEX, - NULL, 0, "close flags", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb2_notify_flags, { "Notify Flags", "smb2.notify.flags", FT_UINT16, BASE_HEX, @@ -6194,7 +6194,7 @@ proto_register_smb2(void) { &hf_smb2_qfid_fid, { "Opaque File ID", "smb2.qfid_fid", FT_BYTES, BASE_NONE, - NULL, 0, "Opaque File ID", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb2_ses_flags_guest, { "Guest", "smb2.ses_flags.guest", FT_BOOLEAN, 16, @@ -6238,7 +6238,7 @@ proto_register_smb2(void) { &hf_smb2_share_flags, { "Share flags", "smb2.share_flags", FT_UINT32, BASE_HEX, - NULL, 0, "share flags", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_smb2_share_flags_dfs, { "dfs", "smb2.share_flags.dfs", FT_BOOLEAN, 32, diff --git a/epan/dissectors/packet-spray.c b/epan/dissectors/packet-spray.c index 803a10b6d0..326498e2e4 100644 --- a/epan/dissectors/packet-spray.c +++ b/epan/dissectors/packet-spray.c @@ -109,11 +109,11 @@ proto_register_spray(void) { &hf_spray_counter, { "counter", "spray.counter", FT_UINT32, BASE_DEC, - NULL, 0, "Counter", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_spray_clock, { "clock", "spray.clock", FT_NONE, BASE_NONE, - NULL, 0, "Clock", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_spray_sec, { "sec", "spray.sec", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 2246eca43c..227e25e3a5 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -4018,12 +4018,12 @@ proto_register_ssl(void) { &hf_ssl_record, { "Record Layer", "ssl.record", FT_NONE, BASE_NONE, NULL, 0x0, - "Record layer", HFILL } + NULL, HFILL } }, { &hf_ssl_record_content_type, { "Content Type", "ssl.record.content_type", FT_UINT8, BASE_DEC, VALS(ssl_31_content_type), 0x0, - "Content type", HFILL} + NULL, HFILL} }, { &hf_ssl2_msg_type, { "Handshake Message Type", "ssl.handshake.type", @@ -4074,7 +4074,7 @@ proto_register_ssl(void) { &hf_ssl_alert_message, { "Alert Message", "ssl.alert_message", FT_NONE, BASE_NONE, NULL, 0x0, - "Alert message", HFILL } + NULL, HFILL } }, { &hf_ssl_alert_message_level, { "Level", "ssl.alert_message.level", @@ -4134,7 +4134,7 @@ proto_register_ssl(void) { &hf_ssl_handshake_cipher_suite, { "Cipher Suite", "ssl.handshake.ciphersuite", FT_UINT16, BASE_HEX, VALS(ssl_31_ciphersuite), 0x0, - "Cipher suite", HFILL } + NULL, HFILL } }, { &hf_ssl2_handshake_cipher_spec, { "Cipher Spec", "ssl.handshake.cipherspec", diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index b564a02f15..dc50124724 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -2063,7 +2063,7 @@ proto_register_tds(void) { &hf_tds7_packet_size, { "Packet Size", "tds7login.packet_size", FT_UINT32, BASE_DEC, NULL, 0x0, - "Packet size", HFILL } + NULL, HFILL } }, { &hf_tds7_client_version, { "Client version", "tds7login.client_version", @@ -2098,7 +2098,7 @@ proto_register_tds(void) { &hf_tds7_reserved_flags, { "Reserved Flags", "tds7login.reserved_flags", FT_UINT8, BASE_HEX, NULL, 0x0, - "reserved flags", HFILL } + NULL, HFILL } }, { &hf_tds7_time_zone, { "Time Zone", "tds7login.time_zone", diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 79b4b10e9a..f1ccb24a29 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -2287,7 +2287,7 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* tipc data type user doesn't change format, reuse v2 function */ next_tvb = tvb_new_subset_remaining(tvb, offset); - call_tipc_v2_data_subdissectors(next_tvb, pinfo, name_type_p, user); + call_tipc_v2_data_subdissectors(next_tvb, pinfo, name_type_p, user); } } /*if (hdr_size <= 5) */ } @@ -2732,7 +2732,7 @@ proto_register_tipc(void) { &hf_tipcv2_probe, { "Probe", "tipcv2.probe", FT_UINT32, BASE_DEC, NULL, 0x00000001, - "probe", HFILL } + NULL, HFILL } }, { &hf_tipcv2_link_tolerance, { "Link Tolerance (ms)", "tipcv2.link_tolerance", diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index b87e034773..996ff6b542 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -5101,11 +5101,11 @@ proto_register_tn3270(void) { &hf_tn3270_command_code, { "Command Code", "tn3270.command_code", FT_UINT8, BASE_HEX, VALS(vals_command_codes), 0x0, - "Command Code", HFILL }}, + NULL, HFILL }}, { &hf_tn3270_sf_length, { "Structured Field Length", "tn3270.sf_length", FT_UINT16, BASE_DEC, NULL, 0x0, - "Structured Field Length", HFILL }}, + NULL, HFILL }}, /* Write Control Characters */ { &hf_tn3270_wcc_nop, { "WCC NOP", diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index 8596dd9dfb..1a02ff53b1 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -1079,7 +1079,7 @@ void proto_register_tns(void) NULL, 0x1000, NULL, HFILL }}, { &hf_tns_ntp_flag_dtest, { "Data test", "tns.ntp_flag.dtest", FT_BOOLEAN, 16, - NULL, 0x0800, "Data Test", HFILL }}, + NULL, 0x0800, NULL, HFILL }}, { &hf_tns_ntp_flag_cbio, { "Callback IO supported", "tns.ntp_flag.cbio", FT_BOOLEAN, 16, NULL, 0x0400, NULL, HFILL }}, diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index d0f0bde239..30d8bf7bd7 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -3093,7 +3093,7 @@ proto_register_vnc(void) { &hf_vnc_color_groups, { "Color groups", "vnc.color_groups", FT_NONE, BASE_NONE, NULL, 0x0, - "Color groups", HFILL } + NULL, HFILL } }, { &hf_vnc_colormap_num_colors, diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index b116adb2b4..07cff2ecb6 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.c @@ -606,7 +606,7 @@ proto_register_vtp(void) { &hf_vtp_md, { "Management Domain", "vtp.md", FT_STRING, BASE_NONE, NULL, 0, - "Management domain", HFILL }}, + NULL, HFILL }}, { &hf_vtp_conf_rev_num, { "Configuration Revision Number", "vtp.conf_rev_num", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -662,7 +662,7 @@ proto_register_vtp(void) { &hf_vtp_vlan_name, { "VLAN Name", "vtp.vlan_info.vlan_name", FT_STRING, BASE_NONE, NULL, 0, - "VLAN name", HFILL }}, + NULL, HFILL }}, { &hf_vtp_vlan_tlvtype, { "Type", "vtp.vlan_info.tlv_type", FT_UINT8, BASE_HEX, VALS(vlan_tlv_type_vals), 0x0, diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index f81914d013..497441bb66 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -17,12 +17,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -209,7 +209,7 @@ static const value_string wlccp_msg_type_vs_5[] = { /* Mask definitions for the NM Flags field */ /* the NM flags are the same as the CM flags except there is no -INBOUND, OUTBOUND, HOPWISE_ROUTING, ROOT_CM, or RELAY flag, and +INBOUND, OUTBOUND, HOPWISE_ROUTING, ROOT_CM, or RELAY flag, and the RESPONSE_REQUEST flag is renamed ACK_REQD */ #define F_ACK_REQD (1<<14) @@ -782,11 +782,11 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ); break; } /* case WLCCP_SAP_MIP */ - + default: { - col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", - "Unknown", + col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", + "Unknown", val_to_str(message_sub_type, wlccp_subtype_vs, "Unknown") ); break; @@ -818,7 +818,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(wlccp_tree, hf_wlccp_type, tvb, 2, 2, FALSE); type = tvb_get_ntohs(tvb, 2); - + proto_tree_add_item(wlccp_tree, hf_wlccp_dstmac, tvb, 4, 6, FALSE); @@ -857,7 +857,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(wlccp_tree, hf_wlccp_destination_node_type, tvb, offset, 2, FALSE); offset += 2; - + proto_tree_add_item(wlccp_tree, hf_wlccp_length, tvb, offset, 2, FALSE); offset += 2; @@ -929,8 +929,8 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } /* case WLCCP_SAP_MIP */ - - default: + + default: { proto_tree_add_item(wlccp_type_tree, hf_wlccp_base_message_type_unknown, @@ -943,7 +943,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* switch sap */ base_message_type=(tvb_get_guint8(tvb,offset) & MT_BASE_MSG_TYPE ); - + offset += 1; } /* Message Type Field */ @@ -952,19 +952,19 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) set_mic_flag(FALSE); set_tlv_flag(FALSE); - switch (sap_id) + switch (sap_id) { case WLCCP_SAP_CCM: { offset = dissect_wlccp_ccm_msg(wlccp_tree, tvb, offset, base_message_type); - + break; } /* case WLCCP_SAP_CCM */ - case WLCCP_SAP_SEC: + case WLCCP_SAP_SEC: { offset = dissect_wlccp_sec_msg(wlccp_tree, tvb, offset, base_message_type); @@ -973,7 +973,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* case WLCCP_SAP_SEC */ - case WLCCP_SAP_RRM: + case WLCCP_SAP_RRM: { offset = dissect_wlccp_rrm_msg(wlccp_tree, tvb, offset, base_message_type); @@ -982,7 +982,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* case WLCCP_SAP_RRM */ - case WLCCP_SAP_QOS: + case WLCCP_SAP_QOS: { offset = dissect_wlccp_qos_msg(wlccp_tree, tvb, offset, base_message_type); @@ -991,7 +991,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* case WLCCP_SAP_QOS */ - case WLCCP_SAP_NM: + case WLCCP_SAP_NM: { offset = dissect_wlccp_nm_msg(wlccp_tree, tvb, offset, base_message_type); @@ -1000,7 +1000,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* case WLCCP_SAP_NM */ - case WLCCP_SAP_MIP: + case WLCCP_SAP_MIP: { offset = dissect_wlccp_mip_msg(wlccp_tree, tvb, offset, base_message_type); @@ -1008,8 +1008,8 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } /* case WLCCP_SAP_MIP */ - - default: + + default: { /* what should we do if we get an undefined SAP? */ @@ -1021,10 +1021,10 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - if(get_tlv_flag() || get_mic_flag()) + if(get_tlv_flag() || get_mic_flag()) { - if (tvb_length_remaining(tvb,offset) < 4) + if (tvb_length_remaining(tvb,offset) < 4) { /* something is wrong if the TLV flag is set and there's not enough left in the buffer */ @@ -1034,7 +1034,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { - while (tvb_length_remaining(tvb,offset) >= 4) + while (tvb_length_remaining(tvb,offset) >= 4) { old_offset = offset; offset = dissect_wlccp_tlvs(wlccp_tree, tvb, offset, 0); @@ -1059,7 +1059,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* these could be implemented with a struct */ -static void set_mic_flag(gboolean flag) +static void set_mic_flag(gboolean flag) { mic_flag=flag; } /*set_mic_flag */ @@ -1101,7 +1101,7 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* Decode the CM Flags Field */ - _ti = proto_tree_add_item(_tree, hf_wlccp_flags, + _ti = proto_tree_add_item(_tree, hf_wlccp_flags, _tvb, _offset, 2, FALSE); _wlccp_cm_flags_tree = proto_item_add_subtree(_ti, ett_wlccp_cm_flags); @@ -1159,7 +1159,7 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off _tvb, _offset, 6, FALSE); _offset += 6; - if(_relay_flag) + if(_relay_flag) { proto_tree_add_item(_tree, hf_wlccp_relay_node_type, _tvb, _offset, 2, FALSE); @@ -1183,7 +1183,7 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* Decode the SCM Flags Field */ - _ti = proto_tree_add_item(_tree, hf_wlccp_scm_flags, + _ti = proto_tree_add_item(_tree, hf_wlccp_scm_flags, _tvb, _offset, 2, FALSE); _wlccp_scm_flags_tree = proto_item_add_subtree(_ti, ett_wlccp_scm_flags); @@ -1213,7 +1213,7 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* Decode the SCM Priority Flags Field */ - _ti = proto_tree_add_item(_tree, hf_wlccp_scm_priority_flags, + _ti = proto_tree_add_item(_tree, hf_wlccp_scm_priority_flags, _tvb, _offset, 1, FALSE); _wlccp_scm_priority_flags_tree = proto_item_add_subtree(_ti, ett_wlccp_scm_priority_flags); @@ -1229,7 +1229,7 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off /* Decode the SCM Bridge Priority Flags Field */ - _ti = proto_tree_add_item(_tree, hf_wlccp_scm_bridge_priority_flags, + _ti = proto_tree_add_item(_tree, hf_wlccp_scm_bridge_priority_flags, _tvb, _offset, 1, FALSE); _wlccp_scm_bridge_priority_flags_tree = proto_item_add_subtree(_ti, ett_wlccp_scm_bridge_priority_flags); @@ -1258,7 +1258,7 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_scm_path_cost, _tvb, _offset, 2, FALSE); _offset += 2; - + proto_tree_add_item(_tree, hf_wlccp_scm_hop_count, _tvb, _offset, 1, FALSE); _offset += 1; @@ -1334,9 +1334,9 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off _tvb, _offset, 6, FALSE); _offset += 6; - /*kan - according to the patent applicatoin these fields vary based + /*kan - according to the patent applicatoin these fields vary based on one another. - For now we decode what we know about and then we'll come back and add + For now we decode what we know about and then we'll come back and add the rest */ proto_tree_add_item(_tree, hf_wlccp_aaa_msg_type, @@ -1356,9 +1356,9 @@ static guint dissect_wlccp_ccm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _off _tvb, _offset, 1, FALSE); _offset += 1; -/* kan - I'm pretty sure this EAPOL tree only applies sometimes, but it's the only complete example that I have +/* kan - I'm pretty sure this EAPOL tree only applies sometimes, but it's the only complete example that I have to test against for now. -For that matter, it may be possible to just hand this piece of the packet over to the EAPOL dissector and let it +For that matter, it may be possible to just hand this piece of the packet over to the EAPOL dissector and let it handle things. To be investigated further */ if (_aaa_msg_type == 0x2) /*EAPOL*/ @@ -1378,13 +1378,13 @@ handle things. To be investigated further */ _tvb, _offset, 1, FALSE); _offset += 1; - + proto_tree_add_item(_wlccp_eapol_msg_tree, hf_wlccp_eapol_type, _tvb, _offset, 1, FALSE); _eapol_type=tvb_get_guint8(_tvb, _offset); _offset += 1; - if (_eapol_type == 0) + if (_eapol_type == 0) { proto_tree_add_item(_wlccp_eapol_msg_tree, hf_wlccp_eap_msg_length, _tvb, _offset, 2, FALSE); @@ -1394,7 +1394,7 @@ handle things. To be investigated further */ proto_tree_add_item(_wlccp_eapol_msg_tree, hf_wlccp_eap_msg, _tvb, _offset, _eap_msg_length, FALSE); _offset += _eap_msg_length; - + } /* if _eapol_type == 0 */ } /* if _aaa_msg_type ==0x2 */ @@ -1577,7 +1577,7 @@ static guint dissect_wlccp_qos_msg(proto_tree *_tree _U_, tvbuff_t *_tvb _U_, gu /* it's just a place holder for now */ - switch (_base_message_type) + switch (_base_message_type) { case 0x01: @@ -1699,23 +1699,23 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs proto_tree_add_item(_tree, hf_wlccp_timestamp, _tvb, _offset, 8, FALSE); _offset += 8; - + proto_tree_add_item(_tree, hf_wlccp_apregstatus, _tvb, _offset, 1, FALSE); _offset += 1; - + _offset += 3; /*kan - skip some apparently unused bytes */ _ti = proto_tree_add_item(_tree, hf_wlccp_ap_node_id, _tvb, _offset, 8, FALSE); - + _wlccp_ap_node_id_tree = proto_item_add_subtree( _ti, ett_wlccp_ap_node_id); proto_tree_add_item(_wlccp_ap_node_id_tree, hf_wlccp_ap_node_type, _tvb, _offset, 2, FALSE); _offset += 2; - + proto_tree_add_item(_wlccp_ap_node_id_tree, hf_wlccp_ap_node_id_address, _tvb, _offset, 6, FALSE); _offset += 6; @@ -1757,7 +1757,7 @@ static guint dissect_wlccp_nm_msg(proto_tree *_tree, tvbuff_t *_tvb, guint _offs _tvb, _offset, 1, FALSE); _offset += 1; - /*kan - skip some apparently unused bytes */ + /*kan - skip some apparently unused bytes */ _offset += 1; break; @@ -1848,7 +1848,7 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse /* this TLV is _length bytes long */ _ti = proto_tree_add_item(_tree, hf_wlccp_tlv, _tvb, _offset, _length, FALSE); /* create the TLV sub tree */ - _tlv_tree = proto_item_add_subtree(_ti, ett_wlccp_tlv_tree); + _tlv_tree = proto_item_add_subtree(_ti, ett_wlccp_tlv_tree); /* save the pointer because we'll add some text to it later */ _temp_ti = _ti; @@ -1864,14 +1864,14 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse /* first 2 bytes are the flags, Group and Type - bit 0 = container, - bit 1 = encrypted, - bits 2-3 = reserved, - bits 4-7 = group ID, - bit 5 = request, - bits 9-15 = type ID + bit 0 = container, + bit 1 = encrypted, + bits 2-3 = reserved, + bits 4-7 = group ID, + bit 5 = request, + bits 9-15 = type ID */ - + /* the TLV group and type IDs are contained in the flags field, extract them */ _group_id = (tvb_get_ntohs(_tvb,_offset) & TLV_GROUP_ID) >> 8; @@ -1943,7 +1943,7 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse /* add the length field to the tlv_tree */ proto_tree_add_item(_tlv_tree, hf_wlccp_tlv_length, _tvb, _offset, 2, FALSE); - + _offset += 2; /* finished with the length field */ @@ -2007,7 +2007,7 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse /* If this TLV is a container, then build a sub tree and decode the contained TLVs */ - if (_container_flag && (_offset >= _tlv_end) ) + if (_container_flag && (_offset >= _tlv_end) ) { /* something is wrong if there's not enough left in the buffer */ @@ -2015,7 +2015,7 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse else /* _container_flag && _offset >= tlv_end */ { - if (_container_flag && (_offset < _tlv_end) ) + if (_container_flag && (_offset < _tlv_end) ) { while (_offset < _tlv_end) @@ -2050,7 +2050,7 @@ static guint dissect_wlccp_ccm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { case 0x00: /* NULL TLV */ - { + { proto_item_append_text(_ti, " NULL TLV"); proto_tree_add_item(_tree, hf_wlccp_null_tlv , _tvb, _offset, _length, FALSE); _offset += _length; @@ -2061,7 +2061,7 @@ static guint dissect_wlccp_ccm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off case 0x09: /* ipv4Address */ - { + { proto_item_append_text(_ti, " IPv4Address"); proto_tree_add_item(_tree, hf_wlccp_ipv4_address, _tvb, _offset, 4, FALSE); _offset += 4; @@ -2071,7 +2071,7 @@ static guint dissect_wlccp_ccm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off } /* case tlv_type_id = 0x09 */ - default: + default: { /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); @@ -2231,7 +2231,7 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off - default: + default: { /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); @@ -2251,7 +2251,7 @@ static guint dissect_wlccp_sec_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offset, gint _type_id, guint _length, proto_item *_ti) { - switch (_type_id) + switch (_type_id) { case 0x02: /* aggrRmReq */ @@ -2356,7 +2356,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_item *_fr_ti; proto_tree *_fr_elems_tree; - + guint _counter=0, _arraylen=0; proto_item_append_text(_ti, " frameReport"); @@ -2383,7 +2383,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off _fr_ti = proto_tree_add_item(_tree, hf_framereport_elements, _tvb, _offset, (_length-10), FALSE); _fr_elems_tree = proto_item_add_subtree(_fr_ti, ett_framereport_elements_tree); - + for(_counter=0; _counter < _arraylen; _counter++) { @@ -2488,7 +2488,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, FALSE); _offset += 1; - + proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, FALSE); _offset += 1; @@ -2516,7 +2516,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_tree, hf_wlccp_token, _tvb, _offset, 1, FALSE); _offset += 1; - + proto_tree_add_item(_tree, hf_wlccp_mode, _tvb, _offset, 1, FALSE); _offset += 1; @@ -2559,8 +2559,8 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off _offset += 2; - /* - if we assume the next field is the capabilities field from the 802.11 beacon, + /* + if we assume the next field is the capabilities field from the 802.11 beacon, then we have a 16-bit field thhf_wlccp_statusat contains the following (802.11-2007): bit 0 = ESS bit 1 = IBSS @@ -2600,23 +2600,23 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off _tvb, _offset, 2, FALSE); proto_tree_add_item(_80211_capabilities_tree, hf_80211_spectrum_mgmt, _tvb, _offset, 2, FALSE); - proto_tree_add_item(_80211_capabilities_tree, hf_80211_chan_agility, + proto_tree_add_item(_80211_capabilities_tree, hf_80211_chan_agility, _tvb, _offset, 2, FALSE); proto_tree_add_item(_80211_capabilities_tree, hf_80211_pbcc, _tvb, _offset, 2, FALSE); - proto_tree_add_item(_80211_capabilities_tree, hf_80211_short_preamble, + proto_tree_add_item(_80211_capabilities_tree, hf_80211_short_preamble, _tvb, _offset, 2, FALSE); - proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_privacy, + proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_privacy, _tvb, _offset, 2, FALSE); - proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_cf_poll_req, + proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_cf_poll_req, _tvb, _offset, 2, FALSE); - proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_cf_pollable, + proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_cf_pollable, _tvb, _offset, 2, FALSE); - proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_ibss, + proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_ibss, _tvb, _offset, 2, FALSE); - proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_ess, + proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_ess, _tvb, _offset, 2, FALSE);; - + /* proto_tree_add_item(_tree, hf_wlccp_capabilities, _tvb, _offset, 2, FALSE); */ _offset += 2; @@ -2660,7 +2660,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off case 0x20: /* rmReqRoutingList */ { - + guint _counter=0, _arraylen=0; proto_item_append_text(_ti, " rmReqRoutingList"); @@ -2994,7 +2994,7 @@ static guint dissect_wlccp_nm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _offs } /* case 0x27 */ - default: + default: { /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); @@ -3019,7 +3019,7 @@ static guint dissect_wlccp_mip_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off { - default: + default: { /* for unknown types, just add them to the tree as a blob */ proto_item_append_text(_ti, " Unknown"); @@ -3350,7 +3350,7 @@ proto_register_wlccp(void) { &hf_wlccp_scm_flags, { "SCM flags", "wlccp.scm_flags", FT_UINT16, BASE_HEX, NULL, - 0x0, "SCM Flags", HFILL } + 0x0, NULL, HFILL } }, { &hf_wlccp_scm_active_flag, @@ -3466,25 +3466,25 @@ proto_register_wlccp(void) FT_UINT64, BASE_DEC, NULL, 0, "Registration Timestamp", HFILL } }, - + { &hf_wlccp_apregstatus, { "Registration Status", "wlccp.apregstatus", FT_UINT8, BASE_HEX, NULL, 0, "AP Registration Status", HFILL } }, - + { &hf_wlccp_ap_node_id, { "AP Node ID", "wlccp.apnodeid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } }, - + { &hf_wlccp_ap_node_type, { "AP Node Type", "wlccp.apnodetype", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } }, - + { &hf_wlccp_ap_node_id_address, { "AP Node Address", "wlccp.apnodeidaddress", FT_ETHER, BASE_NONE, NULL, 0, @@ -3601,14 +3601,14 @@ proto_register_wlccp(void) { &hf_wlccp_null_tlv, { "NULL TLV", "wlccp.wlccp_null_tlv", - FT_BYTES, BASE_NONE, NULL , + FT_BYTES, BASE_NONE, NULL , 0, NULL, HFILL } }, { &hf_wlccp_tlv_type, { "TLV Type", "wlccp.wlccp_tlv_type", - FT_UINT16, BASE_DEC, NULL , + FT_UINT16, BASE_DEC, NULL , TLV_TYPE_ID, "TLV Type ID", HFILL } }, @@ -3650,7 +3650,7 @@ proto_register_wlccp(void) { &hf_wlccp_tlv_group, { "TLV Group", "wlccp.wlccp_tlv_group", - FT_UINT16, BASE_DEC, VALS(wlccp_tlv_group_vs) , + FT_UINT16, BASE_DEC, VALS(wlccp_tlv_group_vs) , TLV_GROUP_ID, "TLV Group ID", HFILL } }, @@ -3782,7 +3782,7 @@ proto_register_wlccp(void) { &hf_wlccp_mode, { "Mode", "wlccp.mode", - FT_UINT8, BASE_HEX, VALS(wlccp_mode_vs), + FT_UINT8, BASE_HEX, VALS(wlccp_mode_vs), 0, NULL, HFILL } }, @@ -3838,7 +3838,7 @@ proto_register_wlccp(void) { &hf_wlccp_capabilities, { "Capabilities", "wlccp.capabilities", FT_UINT16, BASE_HEX, NULL, 0, - "Capabilities", HFILL } + NULL, HFILL } }, */ @@ -4009,7 +4009,7 @@ proto_register_wlccp(void) { &hf_wlccp_numframes, { "Number of frames", "wlccp.numframes", FT_UINT8, BASE_DEC, NULL, 0, - "Number of Frames", HFILL } + NULL, HFILL } }, { &hf_wlccp_mfpcapability, @@ -4080,7 +4080,7 @@ proto_register_wlccp(void) } }; /* hf_register_info hf */ - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_wlccp, @@ -4110,7 +4110,7 @@ proto_register_wlccp(void) proto_register_field_array(proto_wlccp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); -} +} void @@ -4137,7 +4137,7 @@ proto_register_wlccp_oui(void) 0x0, NULL, HFILL } } }; - + llc_add_oui(OUI_CISCOWL, "llc.wlccp_pid", "Cisco WLCCP OUI PID", hf); } diff --git a/epan/dissectors/packet-xyplex.c b/epan/dissectors/packet-xyplex.c index b036356a41..bd344c68bd 100644 --- a/epan/dissectors/packet-xyplex.c +++ b/epan/dissectors/packet-xyplex.c @@ -177,12 +177,12 @@ proto_register_xyplex(void) { &hf_xyplex_server_port, { "Server Port", "xyplex.server_port", FT_UINT16, BASE_DEC, NULL, 0x0, - "Server port", HFILL }}, + NULL, HFILL }}, { &hf_xyplex_return_port, { "Return Port", "xyplex.return_port", FT_UINT16, BASE_DEC, NULL, 0x0, - "Return port", HFILL }}, + NULL, HFILL }}, { &hf_xyplex_reserved, { "Reserved field", "xyplex.reserved", @@ -192,7 +192,7 @@ proto_register_xyplex(void) { &hf_xyplex_reply, { "Registration Reply", "xyplex.reply", FT_UINT16, BASE_DEC, VALS(xyplex_reg_vals), 0x0, - "Registration reply", HFILL }}, + NULL, HFILL }}, }; static gint *ett[] = { diff --git a/epan/dissectors/packet-ypbind.c b/epan/dissectors/packet-ypbind.c index de90758a66..c1783fc583 100644 --- a/epan/dissectors/packet-ypbind.c +++ b/epan/dissectors/packet-ypbind.c @@ -181,7 +181,7 @@ proto_register_ypbind(void) { &hf_ypbind_resp_type, { "Response Type", "ypbind.resp_type", FT_UINT32, BASE_DEC, - VALS(resp_type_vals), 0, "Response type", HFILL }}, + VALS(resp_type_vals), 0, NULL, HFILL }}, { &hf_ypbind_error, { "Error", "ypbind.error", FT_UINT32, BASE_DEC, diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c index 741da85296..44ddf64e36 100644 --- a/plugins/docsis/packet-dsdreq.c +++ b/plugins/docsis/packet-dsdreq.c @@ -110,7 +110,7 @@ proto_register_docsis_dsdreq (void) {&hf_docsis_dsdreq_sfid, {"Service Flow ID", "docsis_dsdreq.sfid", FT_UINT32, BASE_DEC, NULL, 0x0, - "Service Flow Id", HFILL} + NULL, HFILL} }, }; diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c index 0d1aa1ba5a..b7219b7478 100644 --- a/plugins/docsis/packet-map.c +++ b/plugins/docsis/packet-map.c @@ -179,7 +179,7 @@ proto_register_docsis_map (void) {&hf_docsis_map, {"Map Message", "docsis_map", FT_BYTES, BASE_NONE, NULL, 0x0, - "MAP Message", HFILL} + NULL, HFILL} }, {&hf_docsis_map_ucd_count, {"UCD Count", "docsis_map.ucdcount", diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c index d802fab599..963910e2a2 100644 --- a/plugins/docsis/packet-mdd.c +++ b/plugins/docsis/packet-mdd.c @@ -39,7 +39,7 @@ #define UPSTREAM_ACTIVE_CHANNEL_LIST 7 #define UPSTREAM_AMBIGUITY_RESOLUTION_CHANNEL_LIST 8 #define UPSTREAM_FREQUENCY_RANGE 9 -#define SYMBOL_CLOCK_LOCKING_INDICATOR 10 +#define SYMBOL_CLOCK_LOCKING_INDICATOR 10 #define CM_STATUS_EVENT_CONTROL 11 #define UPSTREAM_TRANSMIT_POWER_REPORTING 12 #define DSG_DA_TO_DSID_ASSOCIATION_ENTRY 13 @@ -311,15 +311,15 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) guint8 type, length; guint8 subtype, sublength; int i; - + proto_item *tlv_item; proto_tree *tlv_tree; - + proto_item *tlv_sub_item; proto_tree *tlv_sub_tree; proto_item *text_item; - - + + len = tvb_reported_length_remaining (tvb, 0); col_set_str(pinfo->cinfo, COL_INFO, "MDD Message:"); @@ -333,7 +333,7 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_item (mdd_tree, hf_docsis_mdd_number_of_fragments, tvb, 1, 1, FALSE); proto_tree_add_item (mdd_tree, hf_docsis_mdd_fragment_sequence_number, tvb, 2, 1, FALSE); proto_tree_add_item (mdd_tree, hf_docsis_mdd_current_channel_dcid, tvb, 3, 1, FALSE); - + /*TLVs...*/ pos = 4; while (pos < len) @@ -342,9 +342,9 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) length = tvb_get_guint8 (tvb, pos + 1); tlv_item = proto_tree_add_text (mdd_tree, tvb, pos, length + 2,"%s", val_to_str(type, mdd_tlv_vals, "Unknown TLV (%u)")); tlv_tree = proto_item_add_subtree (tlv_item, ett_tlv); - + switch(type) { - + case DOWNSTREAM_ACTIVE_CHANNEL_LIST: subpos = pos + 2; while (subpos < pos + length + 2) { @@ -544,7 +544,7 @@ void proto_register_docsis_mdd (void) {&hf_docsis_mdd, {"Map Message", "docsis_mdd", FT_BYTES, BASE_NONE, NULL, 0x0, - "MAP Message", HFILL} + NULL, HFILL} }, {&hf_docsis_mdd_ccc, {"Configuration Change Count", "docsis_mdd.ccc", @@ -645,12 +645,12 @@ void proto_register_docsis_mdd (void) {"RPC Center Frequency Spacing", "docsis_mdd.rpc_center_frequency_spacing", FT_UINT8, BASE_DEC, VALS(rpc_center_frequency_spacing_vals), 0x0, "Mdd RPC Center Frequency Spacing", HFILL} - }, + }, {&hf_docsis_mdd_verbose_rcp_reporting, {"Verbose RCP reporting", "docsis_mdd.verbose_rpc_reporting", FT_UINT8, BASE_DEC, VALS(verbose_rpc_reporting_vals), 0x0, "Mdd Verbose RPC Reporting", HFILL} - }, + }, {&hf_docsis_mdd_ip_provisioning_mode, {"IP Provisioning Mode", "docsis_mdd.ip_provisioning_mode", FT_UINT8, BASE_DEC, VALS(ip_provisioning_mode_vals), 0x0, |