diff options
-rw-r--r-- | epan/dissectors/packet-isns.c | 76 | ||||
-rw-r--r-- | epan/dissectors/packet-lwres.c | 128 |
2 files changed, 102 insertions, 102 deletions
diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index e0d5cc8551..aa45e59557 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -1416,71 +1416,71 @@ void proto_register_isns(void) { &hf_isns_version, { "iSNSP Version","isns.PVer", FT_UINT16, BASE_DEC, NULL, 0, - "iSNS Protocol Version" ,HFILL} + "iSNS Protocol Version", HFILL} }, { &hf_isns_function_id, { "Function ID","isns.functionid", FT_UINT16, BASE_DEC,VALS(isns_function_ids),0, - "iSNS Function ID" ,HFILL} + "iSNS Function ID", HFILL} }, { &hf_isns_pdu_length, { "PDU Length","isns.pdulength", FT_UINT16, BASE_DEC,NULL,0, - "iSNS PDU Length" ,HFILL} + "iSNS PDU Length", HFILL} }, { &hf_isns_flags, { "Flags","isns.flags", FT_UINT16, BASE_HEX,NULL,0, - "iSNS Flags" ,HFILL} + "iSNS Flags", HFILL} }, { &hf_isns_client, { "Client","isns.flags.client", FT_BOOLEAN, 16, TFS(&tfs_isns_flag_client), ISNS_FLAGS_CLIENT, - "iSNS Client" ,HFILL} + "iSNS Client", HFILL} }, { &hf_isns_server, { "Server","isns.flags.server", FT_BOOLEAN, 16, TFS(&tfs_isns_flag_server), ISNS_FLAGS_SERVER, - "iSNS Server" ,HFILL} + "iSNS Server", HFILL} }, { &hf_isns_auth, { "Auth","isns.flags.authentication_block", FT_BOOLEAN, 16, TFS(&tfs_isns_flag_auth), ISNS_FLAGS_AUTH, - "is iSNS Authentication Block present?" ,HFILL} + "is iSNS Authentication Block present?", HFILL} }, { &hf_isns_replace, { "Replace","isns.flags.replace", FT_BOOLEAN, 16, TFS(&tfs_isns_flag_replace), ISNS_FLAGS_REPLACE, - "iSNS Replace" ,HFILL} + "iSNS Replace", HFILL} }, { &hf_isns_last_pdu, { "Last PDU","isns.flags.lastpdu", FT_BOOLEAN, 16, TFS(&tfs_isns_flag_last_pdu), ISNS_FLAGS_LAST_PDU, - "iSNS Last PDU" ,HFILL} + "iSNS Last PDU", HFILL} }, { &hf_isns_first_pdu, { "First PDU","isns.flags.firstpdu", FT_BOOLEAN, 16, TFS(&tfs_isns_flag_first_pdu), ISNS_FLAGS_FIRST_PDU, - "iSNS First PDU",HFILL } + "iSNS First PDU", HFILL } }, { &hf_isns_transaction_id, { "Transaction ID","isns.transactionid", FT_UINT16, BASE_DEC,NULL,0, - "iSNS transaction ID" ,HFILL} + "iSNS transaction ID", HFILL} }, { &hf_isns_sequence_id, { "Sequence ID","isns.sequenceid", FT_UINT16, BASE_DEC,NULL,0, - "iSNS sequence ID" ,HFILL} + "iSNS sequence ID", HFILL} }, { &hf_isns_entity_protocol, { "Entity Protocol","isns.entity_protocol", FT_UINT32, BASE_DEC,VALS(isns_entity_protocol),0, - "iSNS Entity Protocol" ,HFILL} + "iSNS Entity Protocol", HFILL} }, /* The Payload stuff */ @@ -1523,7 +1523,7 @@ void proto_register_isns(void) { &hf_isns_port_type, { "Port Type","isns.port.port_type", FT_BOOLEAN, 16, TFS(&tfs_isns_port_type), 0x01, /* bit 15 (or bit 1 of a 16bit word) */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_psb, @@ -1534,37 +1534,37 @@ void proto_register_isns(void) { &hf_isns_psb_tunnel_mode, { "Tunnel Mode","isns.psb.tunnel", FT_BOOLEAN, 32, TFS(&tfs_isns_psb_tunnel_mode), 0x0040, /* bit 25 */ - "Tunnel Mode Preferred",HFILL } + "Tunnel Mode Preferred", HFILL } }, { &hf_isns_psb_transport_mode, { "Transport Mode","isns.psb.transport", FT_BOOLEAN, 32, TFS(&tfs_isns_psb_transport_mode), 0x0020, /* bit 26 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_psb_pfs, { "PFS","isns.psb.pfs", FT_BOOLEAN, 32, TFS(&tfs_isns_psb_pfs), 0x0010, /* bit 27 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_psb_aggressive_mode, { "Aggressive Mode","isns.psb.aggressive_mode", FT_BOOLEAN, 32, TFS(&tfs_isns_psb_aggressive_mode), 0x0008, /* bit 28 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_psb_main_mode, { "Main Mode","isns.psb.main_mode", FT_BOOLEAN, 32, TFS(&tfs_isns_psb_main_mode), 0x0004, /* bit 29 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_psb_ike_ipsec, { "IKE/IPSec","isns.psb.ike_ipsec", FT_BOOLEAN, 32, TFS(&tfs_isns_psb_ike_ipsec), 0x0002, /* bit 30 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_psb_bitmap, { "Bitmap","isns.psb.bitmap", FT_BOOLEAN, 32, TFS(&tfs_isns_psb_bitmap), 0x0001, /* bit 31 */ - NULL,HFILL } + NULL, HFILL } }, @@ -1577,90 +1577,90 @@ void proto_register_isns(void) { &hf_isns_scn_bitmap_initiator_and_self_information_only, { "Initiator And Self Information Only","isns.scn_bitmap.initiator_and_self_information_only", FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_initiator_and_self_information_only), 0x0080, /* bit 24 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_scn_bitmap_target_and_self_information_only, { "Target And Self Information Only","isns.scn_bitmap.target_and_self_information_only", FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_target_and_self_information_only), 0x0040, /* bit 25 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_scn_bitmap_management_registration_scn, { "Management Registration/SCN","isns.scn_bitmap.management_registration_scn", FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_management_registration_scn), 0x0020, /* bit 26 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_scn_bitmap_object_removed, { "Object Removed","isns.scn_bitmap.object_removed", FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_object_removed), 0x0010, /* bit 27 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_scn_bitmap_object_added, { "Object Added","isns.scn_bitmap.object_added", FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_object_added), 0x0008, /* bit 28 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_scn_bitmap_object_updated, { "Object Updated","isns.scn_bitmap.object_updated", FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_object_updated), 0x0004, /* bit 29 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_scn_bitmap_dd_dds_member_removed, { "DD/DDS Member Removed (Mgmt Reg/SCN only)","isns.scn_bitmap.dd_dds_member_removed", FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_dd_dds_member_removed), 0x0002, /* bit 30 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_scn_bitmap_dd_dds_member_added, { "DD/DDS Member Added (Mgmt Reg/SCN only)","isns.scn_bitmap.dd_dds_member_added", FT_BOOLEAN, 32, TFS(&tfs_isns_scn_bitmap_dd_dds_member_added), 0x0001, /* bit 31 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_isnt_control, { "Control","isns.isnt.control", FT_BOOLEAN, 32, TFS(&tfs_isns_isnt_control), 0x0004, /* bit 29 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_isnt_initiator, { "Initiator","isns.isnt.initiator", FT_BOOLEAN, 32, TFS(&tfs_isns_isnt_initiator), 0x0002, /* bit 30 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_isnt_target, { "Target","isns.isnt.target", FT_BOOLEAN, 32, TFS(&tfs_isns_isnt_target), 0x0001, /* bit 31 */ - NULL,HFILL } + NULL, HFILL } }, { &hf_isns_resp_errorcode, { "ErrorCode","isns.errorcode", FT_UINT32, BASE_DEC,VALS(isns_errorcode),0, - "iSNS Response Error Code" ,HFILL} + "iSNS Response Error Code", HFILL} }, { &hf_isns_attr_tag, { "Attribute Tag","isns.attr.tag", FT_UINT32, BASE_DEC,VALS(isns_attribute_tags),0, - "iSNS Attribute Tag" ,HFILL} + "iSNS Attribute Tag", HFILL} }, { &hf_isns_attr_len, { "Attribute Length","isns.attr.len", FT_UINT32, BASE_DEC,NULL,0, - "iSNS Attribute Length" ,HFILL} + "iSNS Attribute Length", HFILL} }, { &hf_isns_delimiter, { "Delimiter","isns.delimiter", FT_NONE, BASE_NONE, NULL,0, - "iSNS Delimiter" ,HFILL} + "iSNS Delimiter", HFILL} }, { &hf_isns_not_decoded_yet, { "Not Decoded Yet","isns.not_decoded_yet", FT_NONE, BASE_NONE, NULL,0, - "This tag is not yet decoded by wireshark" ,HFILL} + "This tag is not yet decoded by Wireshark", HFILL} }, { &hf_isns_heartbeat_ipv6_addr, @@ -1947,7 +1947,7 @@ void proto_register_isns(void) { &hf_isns_payload, { "Payload", "isns.payload", FT_BYTES, BASE_NONE, NULL, 0, - NULL ,HFILL} + NULL, HFILL} } }; diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index a641b18c97..e2a3fc1153 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -42,15 +42,15 @@ #define LWRES_LWPACKETFLAG_RESPONSE 0x0001U /* if set, pkt is a response */ #define LWRES_LWPACKETVERSION_0 0 -#define LW_LENGTH_OFFSET 0 -#define LW_VERSION_OFFSET 4 +#define LW_LENGTH_OFFSET 0 +#define LW_VERSION_OFFSET 4 #define LW_PKTFLASG_OFFSET 6 -#define LW_SERIAL_OFFSET 8 -#define LW_OPCODE_OFFSET 12 -#define LW_RESULT_OFFSET 16 -#define LW_RECVLEN_OFFSET 20 -#define LW_AUTHTYPE_OFFSET 24 -#define LW_AUTHLEN_OFFSET 26 +#define LW_SERIAL_OFFSET 8 +#define LW_OPCODE_OFFSET 12 +#define LW_RESULT_OFFSET 16 +#define LW_RECVLEN_OFFSET 20 +#define LW_AUTHTYPE_OFFSET 24 +#define LW_AUTHLEN_OFFSET 26 #define LWRES_OPCODE_NOOP 0x00000000U #define LWRES_OPCODE_GETADDRSBYNAME 0x00010001U @@ -94,7 +94,7 @@ static const value_string t_types[] = { { T_SRV, "T_SRV" }, { 0, NULL }, }; - + @@ -257,8 +257,8 @@ static void dissect_getnamebyaddr_response(tvbuff_t* tvb, proto_tree* lwres_tree { guint32 i, offset; guint16 naliases,realnamelen,aliaslen; - gchar *aliasname; - + gchar *aliasname; + proto_item* nba_resp_item; proto_tree* nba_resp_tree; @@ -293,7 +293,7 @@ static void dissect_getnamebyaddr_response(tvbuff_t* tvb, proto_tree* lwres_tree hf_adn_namelen, tvb, LWRES_LWPACKET_LENGTH + 6, - 2, + 2, FALSE); proto_tree_add_item(nba_resp_tree, @@ -340,7 +340,7 @@ static void dissect_getaddrsbyname_request(tvbuff_t* tvb, proto_tree* lwres_tree proto_item* adn_request_item; proto_tree* adn_request_tree; - + namelen = tvb_get_ntohs(tvb, LWRES_LWPACKET_LENGTH + 8); if(lwres_tree) @@ -381,7 +381,7 @@ static void dissect_getaddrsbyname_request(tvbuff_t* tvb, proto_tree* lwres_tree LWRES_LWPACKET_LENGTH+10, namelen, FALSE); - + } @@ -400,7 +400,7 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, proto_tree* lwres_tre proto_item* addr_item; proto_tree* addr_tree; - + if(lwres_tree) { @@ -413,17 +413,17 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, proto_tree* lwres_tre naddrs = tvb_get_ntohs(tvb, LWRES_LWPACKET_LENGTH + 6); realnamelen = tvb_get_ntohs(tvb, LWRES_LWPACKET_LENGTH + 8); - + proto_tree_add_item(adn_resp_tree, hf_adn_flags, - tvb, + tvb, LWRES_LWPACKET_LENGTH, 4, FALSE); proto_tree_add_item(adn_resp_tree, hf_adn_naliases, - tvb, + tvb, LWRES_LWPACKET_LENGTH + 4, 2, FALSE); @@ -439,9 +439,9 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, proto_tree* lwres_tre hf_adn_namelen, tvb, LWRES_LWPACKET_LENGTH + 8, - 2, + 2, FALSE); - + proto_tree_add_item(adn_resp_tree, hf_adn_realname, tvb, @@ -487,14 +487,14 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, proto_tree* lwres_tre length = tvb_get_ntohs(tvb, offset + 4); addr = (gchar*)tvb_get_ptr(tvb, offset + 6, 4); slen = (int)strlen((char*)ip_to_str((guint8*)addr)); - + addr_item = proto_tree_add_text(adn_resp_tree,tvb, offset, 4+2+4, "Address %s",ip_to_str((guint8*)addr)); addr_tree = proto_item_add_subtree(addr_item, ett_adn_addr); - proto_tree_add_uint(addr_tree, + proto_tree_add_uint(addr_tree, hf_adn_family, - tvb, - offset, + tvb, + offset, 4, family); @@ -536,12 +536,12 @@ static void dissect_a_records(tvbuff_t* tvb, proto_tree* tree,guint32 nrec,int o a_rec_tree = proto_item_add_subtree(a_rec_item, ett_a_rec); } - else + else return; for(i=0; i<nrec; i++) { - + curr = offset + ((sizeof(guint32)+sizeof(guint16)) * i); len = tvb_get_ntohs(tvb,curr); @@ -554,7 +554,7 @@ static void dissect_a_records(tvbuff_t* tvb, proto_tree* tree,guint32 nrec,int o proto_item_set_text(addr_item,"Address %s",ip_to_str((guint8*)addr)); } else return; - + proto_tree_add_uint(addr_tree, hf_a_rec_len, tvb, @@ -562,13 +562,13 @@ static void dissect_a_records(tvbuff_t* tvb, proto_tree* tree,guint32 nrec,int o sizeof(guint16), len); - proto_tree_add_text(addr_tree, + proto_tree_add_text(addr_tree, tvb, - curr + 2, - 4, + curr + 2, + 4, "Addr: %s", ip_to_str((guint8*)addr)); - + } } @@ -611,7 +611,7 @@ static void dissect_srv_records(tvbuff_t* tvb, proto_tree* tree,guint32 nrec,int priority, weight, port, - dname); + dname); } else return; @@ -644,21 +644,21 @@ static void dissect_srv_records(tvbuff_t* tvb, proto_tree* tree,guint32 nrec,int "DNAME: %s", dname); curr+=((sizeof(short)*4) + dlen); - + } } static void dissect_mx_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, int offset) { - + guint i, curr; guint len, priority, dlen, namelen; const guchar *dname; proto_item* mx_rec_item, *rec_item; proto_tree* mx_rec_tree, *rec_tree; - + if(tree) { @@ -667,7 +667,7 @@ static void dissect_mx_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, in } else return; - + curr = offset; for(i=0; i < nrec; i++) { @@ -681,17 +681,17 @@ static void dissect_mx_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, in priority,dname); rec_tree = proto_item_add_subtree(rec_item, ett_mx_rec_item); } - else + else return; - + proto_tree_add_uint(rec_tree, hf_srv_prio, tvb, curr + 2, 2, priority); - + proto_tree_add_text(rec_tree, tvb, curr + 4, @@ -699,10 +699,10 @@ static void dissect_mx_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, in "name: %s", dname); curr+=((sizeof(short)*2) + dlen); - + } - + } static void dissect_ns_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, int offset) @@ -713,7 +713,7 @@ static void dissect_ns_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, in proto_item* ns_rec_item, *rec_item; proto_tree* ns_rec_tree, *rec_tree; - + if(tree) { ns_rec_item = proto_tree_add_text(tree, tvb, offset, offset, "NS record (%d)", nrec); @@ -742,9 +742,9 @@ static void dissect_ns_records(tvbuff_t* tvb, proto_tree* tree, guint32 nrec, in dlen, "Name: %s", dname); curr+=(sizeof(short) + dlen); - + } - + } @@ -759,11 +759,11 @@ static void dissect_rdata_request(tvbuff_t* tvb, proto_tree* lwres_tree) if(lwres_tree) { - rdata_request_item = + rdata_request_item = proto_tree_add_text(lwres_tree,tvb,LWRES_LWPACKET_LENGTH,10+namelen+1,"RDATA request parameters"); rdata_request_tree = proto_item_add_subtree(rdata_request_item, ett_rdata_req); } - else + else return; proto_tree_add_item(rdata_request_tree, @@ -912,7 +912,7 @@ static void dissect_noop(tvbuff_t* tvb, proto_tree* lwres_tree) datalen = tvb_get_ntohs(tvb, LWRES_LWPACKET_LENGTH); data = (char*)tvb_get_ptr(tvb, LWRES_LWPACKET_LENGTH, datalen); - + if(lwres_tree) { noop_item = proto_tree_add_text(lwres_tree, tvb, LWRES_LWPACKET_LENGTH, 10, "Noop record"); @@ -948,9 +948,9 @@ static void dissect_getnamebyaddr(tvbuff_t* tvb, proto_tree* lwres_tree, int typ static void dissect_getrdatabyname(tvbuff_t* tvb, proto_tree* lwres_tree, int type) { - if(type == 1) + if(type == 1) dissect_rdata_request(tvb, lwres_tree); - else + else dissect_rdata_response(tvb, lwres_tree); } @@ -1021,7 +1021,7 @@ dissect_lwres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) LW_VERSION_OFFSET, sizeof(guint16), version); - + @@ -1126,7 +1126,7 @@ proto_register_lwres(void) { "Result", "lwres.result", FT_UINT32, BASE_DEC, VALS(result_values), 0x0, "lwres result", HFILL }}, - { &hf_recvlen, + { &hf_recvlen, { "Received length", "lwres.recvlen", FT_UINT32, BASE_DEC, NULL, 0x0, "lwres recvlen", HFILL }}, @@ -1135,10 +1135,10 @@ proto_register_lwres(void) "lwres authtype", HFILL }}, { &hf_authlen, - { "Auth. length", "lwres.authlen" , FT_UINT16, BASE_DEC, NULL, 0x0, + { "Auth. length", "lwres.authlen", FT_UINT16, BASE_DEC, NULL, 0x0, "lwres authlen", HFILL }}, - { &hf_rflags, + { &hf_rflags, { "Flags", "lwres.rflags", FT_UINT32, BASE_HEX, NULL, 0x0, "lwres rflags", HFILL }}, { &hf_rdclass, @@ -1147,27 +1147,27 @@ proto_register_lwres(void) { &hf_rdtype, { "Type", "lwres.type", FT_UINT16, BASE_DEC, VALS(t_types), 0x0, - "lwres type" , HFILL }}, + "lwres type", HFILL }}, { &hf_namelen, { "Name length", "lwres.namelen", FT_UINT16, BASE_DEC, NULL, 0x0, "lwres namelen", HFILL }}, { &hf_req_name, - { "Domain name" , "lwres.reqdname" , FT_STRING, BASE_NONE, NULL, 0x0, + { "Domain name", "lwres.reqdname", FT_STRING, BASE_NONE, NULL, 0x0, "lwres reqdname", HFILL }}, { &hf_ttl, - { "Time To Live", "lwres.ttl", FT_UINT32, BASE_DEC, NULL, 0x0, + { "Time To Live", "lwres.ttl", FT_UINT32, BASE_DEC, NULL, 0x0, "lwres ttl", HFILL }}, { &hf_nrdatas, { "Number of rdata records", "lwres.nrdatas", FT_UINT16, BASE_DEC, NULL, 0x0, - "lwres nrdatas" , HFILL }}, - + "lwres nrdatas", HFILL }}, + { &hf_nsigs, { "Number of signature records", "lwres.nsigs", FT_UINT16, BASE_DEC, NULL, 0x0, - "lwres nsigs" , HFILL }}, + "lwres nsigs", HFILL }}, { &hf_realnamelen, { "Real name length", "lwres.realnamelen", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -1211,23 +1211,23 @@ proto_register_lwres(void) { &hf_adn_name, { "Name", "lwres.adn.name", FT_STRING, BASE_NONE, NULL, 0x0, - "lwres adn name", HFILL }}, + "lwres adn name", HFILL }}, { &hf_adn_naliases, { "Number of aliases", "lwres.adn.naliases", FT_UINT16, BASE_DEC, NULL, 0x0, - "lwres adn naliases", HFILL }}, + "lwres adn naliases", HFILL }}, { &hf_adn_naddrs, { "Number of addresses", "lwres.adn.naddrs", FT_UINT16, BASE_DEC, NULL, 0x0, - "lwres adn naddrs", HFILL }}, + "lwres adn naddrs", HFILL }}, { &hf_adn_realname, { "Real name", "lwres.adn.realname", FT_STRING, BASE_NONE, NULL, 0x0, - "lwres adn realname", HFILL }}, + "lwres adn realname", HFILL }}, { &hf_adn_aliasname, { "Alias name", "lwres.adn.aliasname", FT_STRING, BASE_NONE, NULL, 0x0, - "lwres adn aliasname", HFILL }}, + "lwres adn aliasname", HFILL }}, { &hf_adn_family, { "Address family", "lwres.adn.addr.family", FT_UINT32, BASE_DEC, NULL, 0x0, |