diff options
author | Jörg Mayer <jmayer@loplof.de> | 2002-08-28 21:04:11 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2002-08-28 21:04:11 +0000 |
commit | 7c4176d8688d6642026d3d322570663c9655c7db (patch) | |
tree | fb24347c14c65d6b8d7f7e93e4060abbb7217e0c /packet-nisplus.c | |
parent | 48be4e530d6635dbf1ef1dafa984c2060f3caa8a (diff) | |
download | wireshark-7c4176d8688d6642026d3d322570663c9655c7db.tar.gz wireshark-7c4176d8688d6642026d3d322570663c9655c7db.tar.bz2 wireshark-7c4176d8688d6642026d3d322570663c9655c7db.zip |
Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine
project.
svn path=/trunk/; revision=6117
Diffstat (limited to 'packet-nisplus.c')
-rw-r--r-- | packet-nisplus.c | 162 |
1 files changed, 81 insertions, 81 deletions
diff --git a/packet-nisplus.c b/packet-nisplus.c index 033246bcaf..827a4a6c12 100644 --- a/packet-nisplus.c +++ b/packet-nisplus.c @@ -1,7 +1,7 @@ /* packet-nisplus.c * 2001 Ronnie Sahlberg <See AUTHORS for email> * - * $Id: packet-nisplus.c,v 1.12 2002/08/02 23:35:55 jmayer Exp $ + * $Id: packet-nisplus.c,v 1.13 2002/08/28 21:00:24 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -277,7 +277,7 @@ dissect_nisplus_time(tvbuff_t *tvb, int offset, proto_tree *tree, int hfindex) static int dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_group_name, offset, NULL); return offset; @@ -296,7 +296,7 @@ dissect_group_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_group); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_group_flags, offset); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, @@ -355,7 +355,7 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_table_col); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_table_col_name, offset, NULL); @@ -364,19 +364,19 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre FALSE); mask_tree = proto_item_add_subtree(mask_item, ett_nisplus_table_col_mask); mask = tvb_get_ntohl(tvb, offset); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_binary, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_binary, tvb, offset, 4, mask); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_encrypted, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_encrypted, tvb, offset, 4, mask); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_xdr, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_xdr, tvb, offset, 4, mask); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_searchable, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_searchable, tvb, offset, 4, mask); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_casesensitive, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_casesensitive, tvb, offset, 4, mask); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_modified, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_modified, tvb, offset, 4, mask); - proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_asn, + proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_asn, tvb, offset, 4, mask); offset += 4; @@ -399,19 +399,19 @@ dissect_table_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_table); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_table_type, offset, NULL); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_table_maxcol, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_table_sep, offset); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, dissect_table, hf_nisplus_table_cols); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_table_path, offset, NULL); proto_item_set_len(lock_item, offset-old_offset); @@ -446,7 +446,7 @@ dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre proto_tree_add_boolean(mask_tree, hf_nisplus_entry_mask_asn, tvb, offset, 4, mask); offset += 4; - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_entry_val, offset, NULL); proto_item_set_len(lock_item, offset-old_offset); @@ -465,7 +465,7 @@ dissect_entry_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_entry); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_entry_type, offset, NULL); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, @@ -487,10 +487,10 @@ dissect_attr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_attr); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_attr_name, offset, NULL); - offset = dissect_rpc_data(tvb, lock_tree, + offset = dissect_rpc_data(tvb, lock_tree, hf_nisplus_attr_val, offset); proto_item_set_len(lock_item, offset-old_offset); @@ -509,7 +509,7 @@ dissect_link_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_link); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_object_type, offset); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, @@ -517,7 +517,7 @@ dissect_link_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_object_name, offset, NULL); - + proto_item_set_len(lock_item, offset-old_offset); return offset; } @@ -535,13 +535,13 @@ dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_endpoint); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_endpoint_uaddr, offset, NULL); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_endpoint_family, offset, NULL); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_endpoint_proto, offset, NULL); proto_item_set_len(lock_item, offset-old_offset); @@ -561,16 +561,16 @@ dissect_directory_server(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_server); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_server_name, offset, NULL); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, dissect_endpoint, hf_nisplus_endpoints); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_key_type, offset); - offset = dissect_rpc_data(tvb, lock_tree, + offset = dissect_rpc_data(tvb, lock_tree, hf_nisplus_key_data, offset); proto_item_set_len(lock_item, offset-old_offset); @@ -592,7 +592,7 @@ dissect_directory_mask(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ offset = dissect_access_rights(tvb, offset, lock_tree); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_object_type, offset); proto_item_set_len(lock_item, offset-old_offset); @@ -614,13 +614,13 @@ dissect_directory_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_directory_name, offset, NULL); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_directory_type, offset); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, dissect_directory_server, hf_nisplus_servers); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_directory_ttl, offset); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, @@ -642,10 +642,10 @@ dissect_nisplus_oid(tvbuff_t *tvb, int offset, proto_tree *tree) lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_oid); - offset = dissect_nisplus_time(tvb, offset, lock_tree, + offset = dissect_nisplus_time(tvb, offset, lock_tree, hf_nisplus_object_ctime); - offset = dissect_nisplus_time(tvb, offset, lock_tree, + offset = dissect_nisplus_time(tvb, offset, lock_tree, hf_nisplus_object_mtime); proto_item_set_len(lock_item, offset-old_offset); @@ -681,11 +681,11 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree offset = dissect_access_rights(tvb, offset, lock_tree); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_object_ttl, offset); type = tvb_get_ntohl(tvb, offset); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_object_type, offset); switch (type) { case NIS_DIRECTORY_OBJ: @@ -704,7 +704,7 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree offset = dissect_link_obj(tvb, offset, pinfo, lock_tree); break; case NIS_PRIVATE_OBJ: - offset = dissect_rpc_data(tvb, lock_tree, + offset = dissect_rpc_data(tvb, lock_tree, hf_nisplus_object_private, offset); break; case NIS_NO_OBJ: @@ -719,18 +719,18 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree return offset; } /* xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - end of nis object, thats right, all this was the definition of + end of nis object, thats right, all this was the definition of ONE SINGLE struct. -*/ +*/ static int dissect_ns_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_object_name, offset, NULL); - + offset = dissect_rpc_array(tvb, pinfo, tree, offset, dissect_nisplus_object, hf_nisplus_object); @@ -740,13 +740,13 @@ dissect_ns_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr static int dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_object_name, offset, NULL); - + offset = dissect_rpc_array(tvb, pinfo, tree, offset, dissect_attr, hf_nisplus_attrs_array); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_ib_flags, offset); offset = dissect_rpc_array(tvb, pinfo, tree, offset, @@ -755,10 +755,10 @@ dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr offset = dissect_rpc_array(tvb, pinfo, tree, offset, dissect_directory_server, hf_nisplus_cbservers); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_ib_bufsize, offset); - offset = dissect_rpc_data(tvb, tree, + offset = dissect_rpc_data(tvb, tree, hf_nisplus_cookie, offset); return offset; @@ -767,15 +767,15 @@ dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr static int dissect_fd_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_fd_dirname, offset, NULL); - - offset = dissect_rpc_string(tvb, tree, + + offset = dissect_rpc_string(tvb, tree, hf_nisplus_fd_requester, offset, NULL); return offset; } - + static int dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { @@ -788,16 +788,16 @@ dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_tag); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_tag_type, offset); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_tag_val, offset, NULL); proto_item_set_len(lock_item, offset-old_offset); return offset; } - + static int dissect_nisplus_taglist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { @@ -810,10 +810,10 @@ dissect_nisplus_taglist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre static int dissect_dump_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_dump_dir, offset, NULL); - offset = dissect_nisplus_time(tvb, offset, tree, + offset = dissect_nisplus_time(tvb, offset, tree, hf_nisplus_dump_time); offset = dissect_rpc_array(tvb, pinfo, tree, offset, @@ -825,7 +825,7 @@ dissect_dump_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre static int dissect_netobj(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_data(tvb, tree, + offset = dissect_rpc_data(tvb, tree, hf_nisplus_dummy, offset); return offset; @@ -834,19 +834,19 @@ dissect_netobj(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr static int dissect_nisname(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_object_name, offset, NULL); - + return offset; } static int dissect_ping_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_ping_dir, offset, NULL); - offset = dissect_nisplus_time(tvb, offset, tree, + offset = dissect_nisplus_time(tvb, offset, tree, hf_nisplus_ping_time); return offset; @@ -956,25 +956,25 @@ static const value_string nis_error[] = { static int dissect_nisplus_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_error, offset); offset = dissect_rpc_array(tvb, pinfo, tree, offset, dissect_nisplus_object, hf_nisplus_object); - offset = dissect_rpc_data(tvb, tree, + offset = dissect_rpc_data(tvb, tree, hf_nisplus_cookie, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_zticks, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_dticks, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_aticks, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_cticks, offset); return offset; @@ -983,16 +983,16 @@ dissect_nisplus_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree static int dissect_fd_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_error, offset); - offset = dissect_rpc_string(tvb, tree, + offset = dissect_rpc_string(tvb, tree, hf_nisplus_fd_dirname, offset, NULL); - - offset = dissect_rpc_data(tvb, tree, + + offset = dissect_rpc_data(tvb, tree, hf_nisplus_dir_data, offset); - offset = dissect_rpc_data(tvb, tree, + offset = dissect_rpc_data(tvb, tree, hf_nisplus_signature, offset); return offset; @@ -1031,16 +1031,16 @@ dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_log_entry); - offset = dissect_nisplus_time(tvb, offset, lock_tree, + offset = dissect_nisplus_time(tvb, offset, lock_tree, hf_nisplus_log_time); - offset = dissect_rpc_uint32(tvb, lock_tree, + offset = dissect_rpc_uint32(tvb, lock_tree, hf_nisplus_log_type, offset); - offset = dissect_rpc_string(tvb, lock_tree, + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_log_principal, offset, NULL); - - offset = dissect_rpc_string(tvb, lock_tree, + + offset = dissect_rpc_string(tvb, lock_tree, hf_nisplus_directory_name, offset, NULL); offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, @@ -1055,10 +1055,10 @@ dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre static int dissect_log_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_error, offset); - offset = dissect_rpc_data(tvb, tree, + offset = dissect_rpc_data(tvb, tree, hf_nisplus_cookie, offset); offset = dissect_rpc_array(tvb, pinfo, tree, offset, @@ -1079,7 +1079,7 @@ dissect_callback_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto static int dissect_change_time(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_nisplus_time(tvb, offset, tree, + offset = dissect_nisplus_time(tvb, offset, tree, hf_nisplus_log_time); return offset; @@ -1088,13 +1088,13 @@ dissect_change_time(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre static int dissect_cp_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_cp_status, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_cp_zticks, offset); - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_cp_dticks, offset); return offset; @@ -1103,7 +1103,7 @@ dissect_cp_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree static int dissect_nisplus_error(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - offset = dissect_rpc_uint32(tvb, tree, + offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_error, offset); return offset; |