From bcb31916f5d356eb1578fdfa79dd3fd99d670030 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 25 Nov 2015 11:51:51 +0100 Subject: TACACS: fix indent (and add modelines) Change-Id: Ia8d52e9d8f8600c28988dd8d3cc11c7fe08943a3 Reviewed-on: https://code.wireshark.org/review/12131 Reviewed-by: Michael Mann --- epan/dissectors/packet-tacacs.c | 169 ++++++++++++++++++++-------------------- 1 file changed, 85 insertions(+), 84 deletions(-) (limited to 'epan/dissectors/packet-tacacs.c') diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 176b9a931d..c9facbb9f7 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -165,9 +165,9 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ { if (type!=TACACS_RESPONSE) { - userlen=tvb_get_guint8(tvb,4); + userlen=tvb_get_guint8(tvb,4); proto_tree_add_uint(tacacs_tree, hf_tacacs_userlen, tvb, 4, 1, userlen); - passlen=tvb_get_guint8(tvb,5); + passlen=tvb_get_guint8(tvb,5); proto_tree_add_uint(tacacs_tree, hf_tacacs_passlen, tvb, 5, 1, passlen); proto_tree_add_item(tree, hf_tacacs_username, tvb, 6, userlen, ENC_ASCII|ENC_NA); proto_tree_add_item(tree, hf_tacacs_password, tvb, 6+userlen, passlen, ENC_ASCII|ENC_NA); @@ -180,9 +180,9 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ } else { - userlen=tvb_get_guint8(tvb,4); + userlen=tvb_get_guint8(tvb,4); proto_tree_add_uint(tacacs_tree, hf_tacacs_userlen, tvb, 4, 1, userlen); - passlen=tvb_get_guint8(tvb,5); + passlen=tvb_get_guint8(tvb,5); proto_tree_add_uint(tacacs_tree, hf_tacacs_passlen, tvb, 5, 1, passlen); proto_tree_add_item(tacacs_tree, hf_tacacs_response, tvb, 6, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tacacs_tree, hf_tacacs_reason, tvb, 7, 1, ENC_BIG_ENDIAN); @@ -207,35 +207,35 @@ proto_register_tacacs(void) { static hf_register_info hf[] = { { &hf_tacacs_version, - { "Version", "tacacs.version", + { "Version", "tacacs.version", FT_UINT8, BASE_HEX, VALS(tacacs_version_vals), 0x0, NULL, HFILL }}, { &hf_tacacs_type, - { "Type", "tacacs.type", + { "Type", "tacacs.type", FT_UINT8, BASE_DEC, VALS(tacacs_type_vals), 0x0, NULL, HFILL }}, { &hf_tacacs_nonce, - { "Nonce", "tacacs.nonce", + { "Nonce", "tacacs.nonce", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_tacacs_userlen, - { "Username length", "tacacs.userlen", + { "Username length", "tacacs.userlen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacacs_passlen, - { "Password length", "tacacs.passlen", + { "Password length", "tacacs.passlen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacacs_response, - { "Response", "tacacs.response", + { "Response", "tacacs.response", FT_UINT8, BASE_DEC, VALS(tacacs_resp_vals), 0x0, NULL, HFILL }}, { &hf_tacacs_reason, - { "Reason", "tacacs.reason", + { "Reason", "tacacs.reason", FT_UINT8, BASE_DEC, VALS(tacacs_reason_vals), 0x0, NULL, HFILL }}, { &hf_tacacs_result1, - { "Result 1", "tacacs.result1", + { "Result 1", "tacacs.result1", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_tacacs_destaddr, @@ -243,27 +243,27 @@ proto_register_tacacs(void) FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacacs_destport, - { "Destination port", "tacacs.destport", + { "Destination port", "tacacs.destport", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacacs_line, - { "Line", "tacacs.line", + { "Line", "tacacs.line", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacacs_result2, - { "Result 2", "tacacs.result2", + { "Result 2", "tacacs.result2", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_tacacs_result3, - { "Result 3", "tacacs.result3", + { "Result 3", "tacacs.result3", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_tacacs_username, - { "Username", "tacacs.username", + { "Username", "tacacs.username", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacacs_password, - { "Password", "tacacs.password", + { "Password", "tacacs.password", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, }; @@ -377,7 +377,7 @@ tacplus_decrypted_tvb_setup( tvbuff_t *tvb, tvbuff_t **dst_tvb, packet_info *pin guint8 session_id[4]; /* TODO Check the possibility to use pinfo->decrypted_data */ -/* session_id is in NETWORK Byte Order, and is used as byte array in the md5_xor */ + /* session_id is in NETWORK Byte Order, and is used as byte array in the md5_xor */ tvb_memcpy(tvb, session_id, 4,4); @@ -443,7 +443,7 @@ proto_tree_add_tacplus_common_fields( tvbuff_t *tvb, proto_tree *tree, int offs offset++; - /* port_len && port */ + /* port_len && port */ val=tvb_get_guint8(tvb,offset); proto_tree_add_uint(tree, hf_tacplus_port_len, tvb, offset, 1, val); if( val ){ @@ -991,183 +991,183 @@ proto_register_tacplus(void) { static hf_register_info hf[] = { { &hf_tacplus_response, - { "Response", "tacplus.response", + { "Response", "tacplus.response", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if TACACS+ response", HFILL }}, { &hf_tacplus_request, - { "Request", "tacplus.request", + { "Request", "tacplus.request", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if TACACS+ request", HFILL }}, { &hf_tacplus_majvers, - { "Major version", "tacplus.majvers", + { "Major version", "tacplus.majvers", FT_UINT8, BASE_DEC, NULL, 0x0, "Major version number", HFILL }}, { &hf_tacplus_minvers, - { "Minor version", "tacplus.minvers", + { "Minor version", "tacplus.minvers", FT_UINT8, BASE_DEC, NULL, 0x0, "Minor version number", HFILL }}, { &hf_tacplus_type, - { "Type", "tacplus.type", + { "Type", "tacplus.type", FT_UINT8, BASE_DEC, VALS(tacplus_type_vals), 0x0, NULL, HFILL }}, { &hf_tacplus_seqno, - { "Sequence number", "tacplus.seqno", + { "Sequence number", "tacplus.seqno", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_flags, - { "Flags", "tacplus.flags", + { "Flags", "tacplus.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_flags_payload_type, - { "Unencrypted", "tacplus.flags.unencrypted", + { "Unencrypted", "tacplus.flags.unencrypted", FT_BOOLEAN, 8, TFS(&tfs_set_notset), FLAGS_UNENCRYPTED, "Is payload unencrypted?", HFILL }}, { &hf_tacplus_flags_connection_type, - { "Single Connection", "tacplus.flags.singleconn", + { "Single Connection", "tacplus.flags.singleconn", FT_BOOLEAN, 8, TFS(&tfs_set_notset), FLAGS_SINGLE, "Is this a single connection?", HFILL }}, { &hf_tacplus_acct_flags, - { "Flags", "tacplus.acct.flags", + { "Flags", "tacplus.acct.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_acct_flags_more, - { "More", "tacplus.acct.flags.more", + { "More", "tacplus.acct.flags.more", FT_BOOLEAN, 8, TFS(&tfs_set_notset), TAC_PLUS_ACCT_FLAG_MORE, NULL, HFILL }}, { &hf_tacplus_acct_flags_start, - { "Start", "tacplus.acct.flags.start", + { "Start", "tacplus.acct.flags.start", FT_BOOLEAN, 8, TFS(&tfs_set_notset), TAC_PLUS_ACCT_FLAG_START, NULL, HFILL }}, { &hf_tacplus_acct_flags_stop, - { "Stop", "tacplus.acct.flags.stop", + { "Stop", "tacplus.acct.flags.stop", FT_BOOLEAN, 8, TFS(&tfs_set_notset), TAC_PLUS_ACCT_FLAG_STOP, NULL, HFILL }}, { &hf_tacplus_acct_flags_watchdog, - { "Watchdog", "tacplus.acct.flags.watchdog", + { "Watchdog", "tacplus.acct.flags.watchdog", FT_BOOLEAN, 8, TFS(&tfs_set_notset), TAC_PLUS_ACCT_FLAG_WATCHDOG, NULL, HFILL }}, { &hf_tacplus_session_id, - { "Session ID", "tacplus.session_id", + { "Session ID", "tacplus.session_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_packet_len, - { "Packet length", "tacplus.packet_len", + { "Packet length", "tacplus.packet_len", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_auth_password, - { "Password", "tacplus.auth_password", + { "Password", "tacplus.auth_password", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_port, - { "Port", "tacplus.port", + { "Port", "tacplus.port", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_remote_address, - { "Remote Address", "tacplus.remote_address", + { "Remote Address", "tacplus.remote_address", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_chap_challenge, - { "Challenge", "tacplus.chap.challenge", + { "Challenge", "tacplus.chap.challenge", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_chap_response, - { "Response", "tacplus.chap.response", + { "Response", "tacplus.chap.response", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_mschap_challenge, - { "Challenge", "tacplus.mschap.challenge", + { "Challenge", "tacplus.mschap.challenge", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_mschap_response, - { "Response", "tacplus.mschap.response", + { "Response", "tacplus.mschap.response", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_arap_nas_challenge, - { "Nas Challenge", "tacplus.arap.nas_challenge", + { "Nas Challenge", "tacplus.arap.nas_challenge", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_arap_remote_challenge, - { "Remote Challenge", "tacplus.arap.remote_challenge", + { "Remote Challenge", "tacplus.arap.remote_challenge", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_arap_remote_response, - { "Remote Response", "tacplus.arap.remote_response", + { "Remote Response", "tacplus.arap.remote_response", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_privilege_level, - { "Privilege Level", "tacplus.privilege_level", + { "Privilege Level", "tacplus.privilege_level", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_authentication_type, - { "Authentication type", "tacplus.authentication_type", + { "Authentication type", "tacplus.authentication_type", FT_UINT8, BASE_DEC, VALS(tacplus_authen_type_vals), 0x0, NULL, HFILL }}, { &hf_tacplus_service, - { "Service", "tacplus.service", + { "Service", "tacplus.service", FT_UINT8, BASE_DEC, VALS(tacplus_authen_service_vals), 0x0, NULL, HFILL }}, { &hf_tacplus_user_len, - { "User len", "tacplus.user_len", + { "User len", "tacplus.user_len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_user, - { "User", "tacplus.user", + { "User", "tacplus.user", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_port_len, - { "Port len", "tacplus.port_len", + { "Port len", "tacplus.port_len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_remote_address_len, - { "Remaddr len", "tacplus.address_len", + { "Remaddr len", "tacplus.address_len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_arg_length, - { "Length", "tacplus.arg_length", + { "Length", "tacplus.arg_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_arg_value, - { "Value", "tacplus.arg_value", + { "Value", "tacplus.arg_value", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_chap_id, - { "ID", "tacplus.chap.id", + { "ID", "tacplus.chap.id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_mschap_id, - { "ID", "tacplus.mschap.id", + { "ID", "tacplus.mschap.id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_authen_action, - { "Action", "tacplus.authen_action", + { "Action", "tacplus.authen_action", FT_UINT8, BASE_DEC, VALS(tacplus_authen_action_vals), 0x0, NULL, HFILL }}, { &hf_tacplus_body_authen_req_cont_flags, - { "Flags", "tacplus.body_authen_req_cont.flags", + { "Flags", "tacplus.body_authen_req_cont.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_authen_req_cont_user_length, - { "User length", "tacplus.body_authen_req_cont.user_length", + { "User length", "tacplus.body_authen_req_cont.user_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_authen_req_cont_data_length, - { "Data length", "tacplus.body_authen_req_cont.data_length", + { "Data length", "tacplus.body_authen_req_cont.data_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_authen_req_cont_user, - { "User", "tacplus.body_authen_req_cont.user", + { "User", "tacplus.body_authen_req_cont.user", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_authen_rep_status, - { "Status", "tacplus.body_authen_rep.status", + { "Status", "tacplus.body_authen_rep.status", FT_UINT8, BASE_HEX, VALS(tacplus_reply_status_vals), 0x0, NULL, HFILL }}, { &hf_tacplus_body_authen_rep_flags, - { "Flags", "tacplus.body_authen_rep.flags", + { "Flags", "tacplus.body_authen_rep.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_authen_rep_server_msg_len, - { "Server message length", "tacplus.body_authen_rep.server_msg_len", + { "Server message length", "tacplus.body_authen_rep.server_msg_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_authen_rep_server_msg, @@ -1175,51 +1175,51 @@ proto_register_tacplus(void) FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_authen_rep_server_data_len, - { "Data length", "tacplus.body_authen_rep_server.data_len", + { "Data length", "tacplus.body_authen_rep_server.data_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_author_req_auth_method, - { "Auth Method", "tacplus.body_author_req.auth_method", + { "Auth Method", "tacplus.body_author_req.auth_method", FT_UINT8, BASE_HEX, VALS(tacplus_authen_method), 0x0, NULL, HFILL }}, { &hf_tacplus_body_author_req_arg_count, - { "Arg count", "tacplus.body_author_req.arg_count", + { "Arg count", "tacplus.body_author_req.arg_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_author_rep_auth_status, - { "Auth Status", "tacplus.body_author_rep.auth_status", + { "Auth Status", "tacplus.body_author_rep.auth_status", FT_UINT8, BASE_HEX, VALS(tacplus_author_status), 0x0, NULL, HFILL }}, { &hf_tacplus_body_author_rep_server_msg_len, - { "Server Msg length", "tacplus.body_author_rep_server.msg_len", + { "Server Msg length", "tacplus.body_author_rep_server.msg_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_author_rep_server_data_len, - { "Data length", "tacplus.body_author_rep_server.data_len", + { "Data length", "tacplus.body_author_rep_server.data_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_author_rep_arg_count, - { "Arg count", "tacplus.body_author_rep.arg_count", + { "Arg count", "tacplus.body_author_rep.arg_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_acct_authen_method, - { "Auth Method", "tacplus.acct.auth_method", + { "Auth Method", "tacplus.acct.auth_method", FT_UINT8, BASE_HEX, VALS(tacplus_authen_method), 0x0, NULL, HFILL }}, { &hf_tacplus_acct_arg_count, - { "Arg count", "tacplus.acct.arg_count", + { "Arg count", "tacplus.acct.arg_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_acct_status, - { "Status", "tacplus.body_acct.status", + { "Status", "tacplus.body_acct.status", FT_UINT8, BASE_HEX, VALS(tacplus_acct_status), 0x0, NULL, HFILL }}, { &hf_tacplus_body_acct_server_msg_len, - { "Server Msg length", "tacplus.body_acct.msg_len", + { "Server Msg length", "tacplus.body_acct.msg_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_acct_data_len, - { "Data length", "tacplus.body_acct.data_len", + { "Data length", "tacplus.body_acct.data_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tacplus_body_acct_server_msg, @@ -1235,14 +1235,15 @@ proto_register_tacplus(void) FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - /* Generated from convert_proto_tree_add_text.pl */ - { &hf_tacplus_ascii_length, { "ASCII Data Length", "tacplus.ascii_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_tacplus_password_length, { "Password Length", "tacplus.password_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_tacplus_chap_data_length, { "CHAP Data Length", "tacplus.chap_data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_tacplus_mschap_data_length, { "MSCHAP Data Length", "tacplus.mschap_data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_tacplus_arap_data_length, { "ARAP Data Length", "tacplus.arap_data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_tacplus_data_length, { "Data", "tacplus.data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + /* Generated from convert_proto_tree_add_text.pl */ + { &hf_tacplus_ascii_length, { "ASCII Data Length", "tacplus.ascii_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_tacplus_password_length, { "Password Length", "tacplus.password_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_tacplus_chap_data_length, { "CHAP Data Length", "tacplus.chap_data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_tacplus_mschap_data_length, { "MSCHAP Data Length", "tacplus.mschap_data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_tacplus_arap_data_length, { "ARAP Data Length", "tacplus.arap_data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_tacplus_data_length, { "Data", "tacplus.data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, }; + static gint *ett[] = { &ett_tacplus, &ett_tacplus_flags, -- cgit v1.2.3