diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-02-20 22:46:24 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-02-20 22:46:24 +0000 |
| commit | cad303d7778b8155ffb4b6d76429cf8581410726 (patch) | |
| tree | bfdd7a51f3022d8c1bfe2dad649d173816103bb7 | |
| parent | 89758cdec88bff25420c5acd3fefba40bfc9af90 (diff) | |
(Trivial) Fix a typo in a comment; Do some whitespace changes.
svn path=/trunk/; revision=41092
| -rw-r--r-- | epan/dissectors/packet-afp.c | 704 |
1 files changed, 352 insertions, 352 deletions
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index 2571ff8691..b117378f18 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -1081,21 +1081,21 @@ decode_vol_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) bitmap = tvb_get_ntohs(tvb, offset); if (tree) { - item = proto_tree_add_item(tree, hf_afp_vol_bitmap, tvb, offset, 2,ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_afp_vol_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_vol_bitmap); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Attributes, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Signature, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_CreateDate, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ModDate, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BackupDate, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ID, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BytesFree, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BytesTotal, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Name, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ExtBytesFree, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ExtBytesTotal, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BlockSize , tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Attributes, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Signature, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_CreateDate, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ModDate, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BackupDate, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ID, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BytesFree, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BytesTotal, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Name, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ExtBytesFree, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ExtBytesTotal, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BlockSize , tvb, offset, 2, ENC_BIG_ENDIAN); } return bitmap; @@ -1111,23 +1111,23 @@ decode_vol_attribute (proto_tree *tree, tvbuff_t *tvb, gint offset) bitmap = tvb_get_ntohs(tvb, offset); if (tree) { - item = proto_tree_add_item(tree, hf_afp_vol_attribute, tvb, offset, 2,ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_afp_vol_attribute, tvb, offset, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_vol_attribute); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_ReadOnly ,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_HasVolumePassword ,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsFileIDs ,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsCatSearch ,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsBlankAccessPrivs,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsUnixPrivs ,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsUTF8Names ,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_NoNetworkUserID ,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_DefaultPrivsFromParent ,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_NoExchangeFiles ,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsExtAttrs ,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsACLs ,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_CaseSensitive ,tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsTMLockSteal ,tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_ReadOnly ,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_HasVolumePassword ,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsFileIDs ,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsCatSearch ,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsBlankAccessPrivs,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsUnixPrivs ,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsUTF8Names ,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_NoNetworkUserID ,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_DefaultPrivsFromParent ,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_NoExchangeFiles ,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsExtAttrs ,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsACLs ,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_CaseSensitive ,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsTMLockSteal ,tvb, offset, 2, ENC_BIG_ENDIAN); } return bitmap; @@ -1180,7 +1180,7 @@ parse_vol_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap) offset += 4; } if ((bitmap & kFPVolIDBit)) { - proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } if ((bitmap & kFPVolBytesFreeBit)) { @@ -1212,7 +1212,7 @@ parse_vol_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap) guint8 len; len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_afp_vol_name, tvb, offset, 1,ENC_UTF_8|ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_vol_name, tvb, offset, 1, ENC_UTF_8|ENC_BIG_ENDIAN); offset += len +1; } @@ -1229,27 +1229,27 @@ decode_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) bitmap = tvb_get_ntohs(tvb, offset); if (tree) { - item = proto_tree_add_item(tree, hf_afp_file_bitmap, tvb, offset, 2,ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_afp_file_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_file_bitmap); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_Attributes , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ParentDirID , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_CreateDate , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ModDate , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_BackupDate , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_FinderInfo , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_LongName , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ShortName , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_NodeID , tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_Attributes , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ParentDirID , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_CreateDate , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ModDate , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_BackupDate , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_FinderInfo , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_LongName , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ShortName , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_NodeID , tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_DataForkLen , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_RsrcForkLen , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ExtDataForkLen , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_LaunchLimit , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_UTF8Name , tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_DataForkLen , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_RsrcForkLen , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ExtDataForkLen , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_LaunchLimit , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_UTF8Name , tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ExtRsrcForkLen , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_UnixPrivs , tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ExtRsrcForkLen , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_UnixPrivs , tvb, offset, 2, ENC_BIG_ENDIAN); } return bitmap; @@ -1270,26 +1270,26 @@ decode_file_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset, int shared) item = proto_tree_add_text(tree, tvb, offset, 2, "File Attributes: 0x%04x", attribute); sub_tree = proto_item_add_subtree(item, ett_afp_file_attribute); - proto_tree_add_item(sub_tree, hf_afp_file_attribute_Invisible , tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_attribute_Invisible , tvb, offset, 2, ENC_BIG_ENDIAN); if (!shared) - proto_tree_add_item(sub_tree, hf_afp_file_attribute_MultiUser , tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_attribute_MultiUser , tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_attribute_System , tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_attribute_System , tvb, offset, 2, ENC_BIG_ENDIAN); if (!shared) { - proto_tree_add_item(sub_tree, hf_afp_file_attribute_DAlreadyOpen , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_attribute_RAlreadyOpen , tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_attribute_DAlreadyOpen , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_attribute_RAlreadyOpen , tvb, offset, 2, ENC_BIG_ENDIAN); } /* writeinhibit is file only but Macs are setting it with FPSetFileDirParms too */ - proto_tree_add_item(sub_tree, hf_afp_file_attribute_WriteInhibit , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_attribute_BackUpNeeded , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_attribute_RenameInhibit, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_attribute_DeleteInhibit, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_attribute_WriteInhibit , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_attribute_BackUpNeeded , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_attribute_RenameInhibit, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_attribute_DeleteInhibit, tvb, offset, 2, ENC_BIG_ENDIAN); if (!shared) - proto_tree_add_item(sub_tree, hf_afp_file_attribute_CopyProtect , tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_attribute_CopyProtect , tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_file_attribute_SetClear , tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_file_attribute_SetClear , tvb, offset, 2, ENC_BIG_ENDIAN); return(attribute); } @@ -1356,9 +1356,9 @@ parse_long_filename(proto_tree *tree, tvbuff_t *tvb, gint offset, gint org_offse if (lnameoff) { tp_ofs = lnameoff +org_offset; len = tvb_get_guint8(tvb, tp_ofs); - proto_tree_add_item(tree, hf_afp_path_len, tvb, tp_ofs, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_path_len, tvb, tp_ofs, 1, ENC_BIG_ENDIAN); tp_ofs++; - proto_tree_add_item(tree, hf_afp_path_name, tvb, tp_ofs, len,ENC_UTF_8|ENC_NA); + proto_tree_add_item(tree, hf_afp_path_name, tvb, tp_ofs, len, ENC_UTF_8|ENC_NA); tp_ofs += len; } return tp_ofs; @@ -1390,14 +1390,14 @@ parse_UTF8_filename(proto_tree *tree, tvbuff_t *tvb, gint offset, gint org_offse else if (tp_ofs < offset) { tp_ofs = offset; } - proto_tree_add_item( tree, hf_afp_path_unicode_hint, tvb, tp_ofs, 4,ENC_BIG_ENDIAN); + proto_tree_add_item( tree, hf_afp_path_unicode_hint, tvb, tp_ofs, 4, ENC_BIG_ENDIAN); tp_ofs += 4; len = tvb_get_ntohs(tvb, tp_ofs); - proto_tree_add_item( tree, hf_afp_path_unicode_len, tvb, tp_ofs, 2,ENC_BIG_ENDIAN); + proto_tree_add_item( tree, hf_afp_path_unicode_len, tvb, tp_ofs, 2, ENC_BIG_ENDIAN); tp_ofs += 2; - proto_tree_add_item(tree, hf_afp_path_name, tvb, tp_ofs, len,ENC_UTF_8|ENC_NA); + proto_tree_add_item(tree, hf_afp_path_name, tvb, tp_ofs, len, ENC_UTF_8|ENC_NA); tp_ofs += len; } return tp_ofs; @@ -1417,7 +1417,7 @@ parse_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap, offset += 2; } if ((bitmap & kFPParentDirIDBit)) { - proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if ((bitmap & kFPCreateDateBit)) { @@ -1451,22 +1451,22 @@ parse_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap, offset += 2; } if ((bitmap & kFPNodeIDBit)) { - proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if ((bitmap & kFPDataForkLenBit)) { - proto_tree_add_item(tree, hf_afp_file_DataForkLen, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_file_DataForkLen, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if ((bitmap & kFPRsrcForkLenBit)) { - proto_tree_add_item(tree, hf_afp_file_RsrcForkLen, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_file_RsrcForkLen, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if ((bitmap & kFPExtDataForkLenBit)) { - proto_tree_add_item(tree, hf_afp_file_ExtDataForkLen, tvb, offset, 8,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_file_ExtDataForkLen, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; } @@ -1483,7 +1483,7 @@ parse_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap, } if ((bitmap & kFPExtRsrcForkLenBit)) { - proto_tree_add_item(tree, hf_afp_file_ExtRsrcForkLen, tvb, offset, 8,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_file_ExtRsrcForkLen, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; } @@ -1512,24 +1512,24 @@ decode_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) bitmap = tvb_get_ntohs(tvb, offset); if (tree) { - item = proto_tree_add_item(tree, hf_afp_dir_bitmap, tvb, offset, 2,ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_afp_dir_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_dir_bitmap); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_Attributes , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ParentDirID , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_CreateDate , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ModDate , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_BackupDate , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_FinderInfo , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_LongName , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ShortName , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_NodeID , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_OffspringCount , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_OwnerID , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_GroupID , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_AccessRights , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_UTF8Name , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_UnixPrivs , tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_Attributes , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ParentDirID , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_CreateDate , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ModDate , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_BackupDate , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_FinderInfo , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_LongName , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ShortName , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_NodeID , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_OffspringCount , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_OwnerID , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_GroupID , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_AccessRights , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_UTF8Name , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_UnixPrivs , tvb, offset, 2, ENC_BIG_ENDIAN); } return bitmap; @@ -1549,14 +1549,14 @@ decode_dir_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset) "Directory Attributes: 0x%04x", attribute); sub_tree = proto_item_add_subtree(item, ett_afp_dir_attribute); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Invisible , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_IsExpFolder , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_System , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Mounted , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_InExpFolder , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_BackUpNeeded , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_RenameInhibit, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_DeleteInhibit, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Invisible , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_IsExpFolder , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_System , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Mounted , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_InExpFolder , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_BackUpNeeded , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_RenameInhibit, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_DeleteInhibit, tvb, offset, 2, ENC_BIG_ENDIAN); } return(attribute); @@ -1576,7 +1576,7 @@ parse_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap) offset += 2; } if ((bitmap & kFPParentDirIDBit)) { - proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if ((bitmap & kFPCreateDateBit)) { @@ -1609,11 +1609,11 @@ parse_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset, guint16 bitmap) offset += 2; } if ((bitmap & kFPNodeIDBit)) { - proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if ((bitmap & kFPOffspringCountBit)) { - proto_tree_add_item(tree, hf_afp_dir_offspring, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_dir_offspring, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* error in AFP3.0.pdf */ } if ((bitmap & kFPOwnerIDBit)) { @@ -1761,7 +1761,7 @@ static gint decode_vol(proto_tree *tree, tvbuff_t *tvb, gint offset) { Vol = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2, ENC_BIG_ENDIAN); return offset + 2; } @@ -1770,11 +1770,11 @@ static gint decode_vol_did(proto_tree *tree, tvbuff_t *tvb, gint offset) { Vol = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; Did = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; } @@ -1852,16 +1852,16 @@ decode_name_label (proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint off item = proto_tree_add_text(tree, tvb, offset, len +header, label, name); sub_tree = proto_item_add_subtree(item, ett_afp_path_name); - proto_tree_add_item( sub_tree, hf_afp_path_type, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item( sub_tree, hf_afp_path_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (type == 3) { - proto_tree_add_item( sub_tree, hf_afp_path_unicode_hint, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item( sub_tree, hf_afp_path_unicode_hint, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item( sub_tree, hf_afp_path_unicode_len, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item( sub_tree, hf_afp_path_unicode_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { - proto_tree_add_item( sub_tree, hf_afp_path_len, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item( sub_tree, hf_afp_path_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } @@ -1922,13 +1922,13 @@ dissect_query_afp_open_vol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!tree) return offset; - proto_tree_add_item(tree, hf_afp_vol_name, tvb, offset, 1,ENC_UTF_8|ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_vol_name, tvb, offset, 1, ENC_UTF_8|ENC_BIG_ENDIAN); offset += len +1; len = tvb_reported_length_remaining(tvb,offset); if (len >= 8) { - /* optionnal password */ - proto_tree_add_item(tree, hf_afp_passwd, tvb, offset, 8,ENC_UTF_8|ENC_NA); + /* optional password */ + proto_tree_add_item(tree, hf_afp_passwd, tvb, offset, 8, ENC_UTF_8|ENC_NA); offset += 8; } return offset; @@ -1983,8 +1983,8 @@ dissect_reply_afp_get_server_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ ti = proto_tree_add_text(tree, tvb, offset , 1,"Flags : 0x%02x", flag); flag_tree = proto_item_add_subtree(ti, ett_afp_vol_flag); - proto_tree_add_item(flag_tree, hf_afp_vol_flag_passwd, tvb, offset, 1,ENC_BIG_ENDIAN); - proto_tree_add_item(flag_tree, hf_afp_vol_flag_has_config, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(flag_tree, hf_afp_vol_flag_passwd, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(flag_tree, hf_afp_vol_flag_has_config, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; len = tvb_get_guint8(tvb, offset) +1; @@ -1992,7 +1992,7 @@ dissect_reply_afp_get_server_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ proto_item_set_text(item, "%s", rep); proto_item_set_len(item, len +1); - proto_tree_add_item(tree, hf_afp_vol_name, tvb, offset, 1,ENC_UTF_8|ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_vol_name, tvb, offset, 1, ENC_UTF_8|ENC_BIG_ENDIAN); offset += len; } @@ -2015,7 +2015,7 @@ dissect_query_afp_with_vol_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree return offset; PAD(1); - proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; } @@ -2027,7 +2027,7 @@ dissect_query_afp_open_fork(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *sub_tree = NULL; proto_item *item; - proto_tree_add_item(tree, hf_afp_fork_type, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_fork_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = decode_vol_did(tree, tvb, offset); @@ -2035,13 +2035,13 @@ dissect_query_afp_open_fork(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, decode_file_bitmap(tree, tvb, offset); offset += 2; if (tree) { - item = proto_tree_add_item(tree, hf_afp_access_mode, tvb, offset, 2,ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_afp_access_mode, tvb, offset, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_access_mode); - proto_tree_add_item(sub_tree, hf_afp_access_read , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_access_write , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_access_deny_read , tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_access_deny_write, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_access_read , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_access_write , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_access_deny_read , tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_access_deny_write, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -2060,7 +2060,7 @@ dissect_reply_afp_open_fork(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 2; add_info_fork(tvb, pinfo, offset); - proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; offset = parse_file_bitmap(tree, tvb, offset, f_bitmap,0); @@ -2076,13 +2076,13 @@ dissect_query_afp_enumerate_ext2(tvbuff_t *tvb, packet_info *pinfo, proto_tree * PAD(1); offset = decode_vol_did_file_dir_bitmap(tree, tvb, offset); - proto_tree_add_item(tree, hf_afp_req_count, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_req_count, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_start_index32, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_start_index32, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_afp_max_reply_size32, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_max_reply_size32, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = decode_name(tree, pinfo, tvb, offset); @@ -2098,13 +2098,13 @@ dissect_query_afp_enumerate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, PAD(1); offset = decode_vol_did_file_dir_bitmap(tree, tvb, offset); - proto_tree_add_item(tree, hf_afp_req_count, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_req_count, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_start_index, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_start_index, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_max_reply_size, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_max_reply_size, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; offset = decode_name(tree, pinfo, tvb, offset); @@ -2158,15 +2158,15 @@ loop_record(tvbuff_t *tvb, proto_tree *ptree, gint offset, tree = proto_item_add_subtree(item, ett_afp_enumerate_line); } if (ext) { - proto_tree_add_item(tree, hf_afp_struct_size16, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_struct_size16, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { - proto_tree_add_item(tree, hf_afp_struct_size, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_struct_size, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } - proto_tree_add_item(tree, hf_afp_file_flag, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_file_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (ext) { PAD(1); @@ -2201,7 +2201,7 @@ reply_enumerate(tvbuff_t *tvb, proto_tree *tree, gint offset, int ext) count = tvb_get_ntohs(tvb, offset); if (tree) { - item = proto_tree_add_item(tree, hf_afp_req_count, tvb, offset, 2,ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_afp_req_count, tvb, offset, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_enumerate); } offset += 2; @@ -2245,11 +2245,11 @@ catsearch_spec(tvbuff_t *tvb, proto_tree *ptree, gint offset, int ext, guint32 b tree = proto_item_add_subtree(item, ett_afp_cat_spec); if (ext) { - proto_tree_add_item(tree, hf_afp_struct_size16, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_struct_size16, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } else { - proto_tree_add_item(tree, hf_afp_struct_size, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_struct_size, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; PAD(1); } @@ -2274,16 +2274,16 @@ query_catsearch(tvbuff_t *tvb, proto_tree *ptree, gint offset, int ext) return offset; PAD(1); - proto_tree_add_item(ptree, hf_afp_vol_id, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(ptree, hf_afp_vol_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(ptree, hf_afp_cat_req_matches, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(ptree, hf_afp_cat_req_matches, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(ptree, hf_afp_reserved, tvb, offset, 4,ENC_NA); + proto_tree_add_item(ptree, hf_afp_reserved, tvb, offset, 4, ENC_NA); offset += 4; - proto_tree_add_item(ptree, hf_afp_cat_position, tvb, offset, 16,ENC_NA); + proto_tree_add_item(ptree, hf_afp_cat_position, tvb, offset, 16, ENC_NA); offset += 16; f_bitmap = decode_file_bitmap(ptree, tvb, offset); @@ -2294,35 +2294,35 @@ query_catsearch(tvbuff_t *tvb, proto_tree *ptree, gint offset, int ext) r_bitmap = tvb_get_ntohl(tvb, offset); /* Already checked this above: if (ptree) */ { - item = proto_tree_add_item(ptree, hf_afp_file_bitmap, tvb, offset, 4,ENC_BIG_ENDIAN); + item = proto_tree_add_item(ptree, hf_afp_file_bitmap, tvb, offset, 4, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_cat_r_bitmap); - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_Attributes , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_ParentDirID , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_CreateDate , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_ModDate , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_BackupDate , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_FinderInfo , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_LongName , tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_Attributes , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_ParentDirID, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_CreateDate , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_ModDate , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_BackupDate , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_FinderInfo , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_LongName , tvb, offset, 4, ENC_BIG_ENDIAN); if (d_bitmap == 0) { /* Only for file-only searches */ - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_DataForkLen , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_RsrcForkLen , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_ExtDataForkLen , tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_DataForkLen , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_RsrcForkLen , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_ExtDataForkLen , tvb, offset, 4, ENC_BIG_ENDIAN); } if (f_bitmap == 0) { /* Only for directory-only searches */ - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_OffspringCount , tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_OffspringCount , tvb, offset, 4, ENC_BIG_ENDIAN); } - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_UTF8Name , tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_UTF8Name , tvb, offset, 4, ENC_BIG_ENDIAN); if (d_bitmap == 0) { /* Only for file-only searches */ - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_ExtRsrcForkLen , tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_ExtRsrcForkLen , tvb, offset, 4, ENC_BIG_ENDIAN); } - proto_tree_add_item(sub_tree, hf_afp_request_bitmap_PartialNames , tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_request_bitmap_PartialNames , tvb, offset, 4, ENC_BIG_ENDIAN); } offset += 4; @@ -2360,7 +2360,7 @@ reply_catsearch(tvbuff_t *tvb, proto_tree *tree, gint offset, int ext) guint16 d_bitmap; int count; - proto_tree_add_item(tree, hf_afp_cat_position, tvb, offset, 16,ENC_NA); + proto_tree_add_item(tree, hf_afp_cat_position, tvb, offset, 16, ENC_NA); offset += 16; f_bitmap = decode_file_bitmap(tree, tvb, offset); @@ -2371,7 +2371,7 @@ reply_catsearch(tvbuff_t *tvb, proto_tree *tree, gint offset, int ext) count = tvb_get_ntohl(tvb, offset); if (tree) { - item = proto_tree_add_item(tree, hf_afp_cat_count, tvb, offset, 4,ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_afp_cat_count, tvb, offset, 4, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_cat_search); } offset += 4; @@ -2401,7 +2401,7 @@ dissect_query_afp_get_vol_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t PAD(1) add_info_vol(tvb, pinfo, offset); - proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; decode_vol_bitmap(tree, tvb, offset); @@ -2433,7 +2433,7 @@ dissect_query_afp_set_vol_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t PAD(1) add_info_vol(tvb, pinfo, offset); - proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; bitmap = decode_vol_bitmap(tree, tvb, offset); @@ -2455,7 +2455,7 @@ decode_uam_parameters(const guint8 *uam, int len_uam, tvbuff_t *tvb, proto_tree PAD(1); len = 8; /* tvb_strsize(tvb, offset);*/ - proto_tree_add_item(tree, hf_afp_passwd, tvb, offset, len,ENC_UTF_8|ENC_NA); + proto_tree_add_item(tree, hf_afp_passwd, tvb, offset, len, ENC_UTF_8|ENC_NA); offset += len; } else if (!g_ascii_strncasecmp(uam, "DHCAST128", len_uam)) { @@ -2463,7 +2463,7 @@ decode_uam_parameters(const guint8 *uam, int len_uam, tvbuff_t *tvb, proto_tree PAD(1); len = 16; - proto_tree_add_item(tree, hf_afp_random, tvb, offset, len,ENC_NA); + proto_tree_add_item(tree, hf_afp_random, tvb, offset, len, ENC_NA); offset += len; } else if (!g_ascii_strncasecmp(uam, "2-Way Randnum exchange", len_uam)) { @@ -2482,11 +2482,11 @@ dissect_query_afp_login(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, const guint8 *uam; len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_afp_Version, tvb, offset, 1,ENC_UTF_8|ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_Version, tvb, offset, 1, ENC_UTF_8|ENC_BIG_ENDIAN); offset += len +1; len_uam = tvb_get_guint8(tvb, offset); uam = tvb_get_ephemeral_string(tvb, offset +1, len_uam); - proto_tree_add_item(tree, hf_afp_UAM, tvb, offset, 1,ENC_UTF_8|ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_UAM, tvb, offset, 1, ENC_UTF_8|ENC_BIG_ENDIAN); offset += len_uam +1; if (!g_ascii_strncasecmp(uam, "No User Authent", len_uam)) { @@ -2494,7 +2494,7 @@ dissect_query_afp_login(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_afp_user, tvb, offset, 1,ENC_UTF_8|ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_user, tvb, offset, 1, ENC_UTF_8|ENC_BIG_ENDIAN); offset += len +1; return decode_uam_parameters(uam, len_uam, tvb, tree, offset); @@ -2510,46 +2510,46 @@ dissect_query_afp_login_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t guint8 path_type; PAD(1); - proto_tree_add_item(tree, hf_afp_login_flags, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_login_flags, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_afp_Version, tvb, offset, 1,ENC_UTF_8|ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_Version, tvb, offset, 1, ENC_UTF_8|ENC_BIG_ENDIAN); offset += len +1; len_uam = tvb_get_guint8(tvb, offset); uam = tvb_get_ephemeral_string(tvb, offset +1, len_uam); - proto_tree_add_item(tree, hf_afp_UAM, tvb, offset, 1,ENC_UTF_8|ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_UAM, tvb, offset, 1, ENC_UTF_8|ENC_BIG_ENDIAN); offset += len_uam +1; - proto_tree_add_item(tree, hf_afp_user_type, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_user_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* only type 3 */ len = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_afp_user_len, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_user_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_user_name, tvb, offset, len,ENC_UTF_8|ENC_NA); + proto_tree_add_item(tree, hf_afp_user_name, tvb, offset, len, ENC_UTF_8|ENC_NA); offset += len; /* directory service */ path_type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_afp_path_type, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_path_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* FIXME use 16 bit len + unicode from smb dissector */ switch (path_type) { case 1: case 2: len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_afp_path_len, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_path_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_afp_path_name, tvb, offset, len,ENC_UTF_8|ENC_NA); + proto_tree_add_item(tree, hf_afp_path_name, tvb, offset, len, ENC_UTF_8|ENC_NA); offset += len; break; case 3: len = tvb_get_ntohs(tvb, offset); - proto_tree_add_item( tree, hf_afp_path_unicode_len, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item( tree, hf_afp_path_unicode_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_path_name, tvb, offset, len,ENC_UTF_8|ENC_NA); + proto_tree_add_item(tree, hf_afp_path_name, tvb, offset, len, ENC_UTF_8|ENC_NA); offset += len; break; default: @@ -2566,19 +2566,19 @@ dissect_query_afp_write(tvbuff_t *tvb, packet_info *pinfo , proto_tree *tree, gi int param; - proto_tree_add_item(tree, hf_afp_flag, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; add_info_fork(tvb, pinfo, offset); - proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_offset, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_offset, tvb, offset, 4, ENC_BIG_ENDIAN); param = tvb_get_ntohl(tvb, offset); col_append_fstr(pinfo->cinfo, COL_INFO, " Offset=%d", param); offset += 4; - proto_tree_add_item(tree, hf_afp_rw_count, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_rw_count, tvb, offset, 4, ENC_BIG_ENDIAN); param = tvb_get_ntohl(tvb, offset); col_append_fstr(pinfo->cinfo, COL_INFO, " Size=%d", param); offset += 4; @@ -2599,17 +2599,17 @@ dissect_reply_afp_write(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, static gint dissect_query_afp_write_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { - proto_tree_add_item(tree, hf_afp_flag, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; add_info_fork(tvb, pinfo, offset); - proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_offset64, tvb, offset, 8,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_offset64, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(tree, hf_afp_rw_count64, tvb, offset, 8,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_rw_count64, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -2633,23 +2633,23 @@ dissect_query_afp_read(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, PAD(1); add_info_fork(tvb, pinfo, offset); - proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_offset, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_offset, tvb, offset, 4, ENC_BIG_ENDIAN); param = tvb_get_ntohl(tvb, offset); col_append_fstr(pinfo->cinfo, COL_INFO, " Offset=%d", param); offset += 4; - proto_tree_add_item(tree, hf_afp_rw_count, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_rw_count, tvb, offset, 4, ENC_BIG_ENDIAN); param = tvb_get_ntohl(tvb, offset); col_append_fstr(pinfo->cinfo, COL_INFO, " Size=%d", param); offset += 4; - proto_tree_add_item(tree, hf_afp_newline_mask, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_newline_mask, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_afp_newline_char, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_newline_char, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; return offset; @@ -2662,13 +2662,13 @@ dissect_query_afp_read_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr PAD(1); add_info_fork(tvb, pinfo, offset); - proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_offset64, tvb, offset, 8,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_offset64, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(tree, hf_afp_rw_count64, tvb, offset, 8,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_rw_count64, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -2682,7 +2682,7 @@ dissect_query_afp_read_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr static gint dissect_reply_afp_open_dt(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { - proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; @@ -2695,7 +2695,7 @@ static gint dissect_query_afp_close_dt(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { PAD(1); - proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; @@ -2714,7 +2714,7 @@ dissect_query_afp_with_fork(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { PAD(1); add_info_fork(tvb, pinfo, offset); - proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; @@ -2746,7 +2746,7 @@ dissect_reply_afp_get_fldr_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr offset += 2; flags = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_afp_file_flag, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_file_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; PAD(1); if (flags) { @@ -2853,7 +2853,7 @@ dissect_query_afp_create_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static gint dissect_reply_afp_create_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { - proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -2863,7 +2863,7 @@ dissect_reply_afp_create_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t static gint dissect_reply_afp_create_dir(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { - proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -2876,9 +2876,9 @@ static gint dissect_query_afp_delete_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { PAD(1); - proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -2891,9 +2891,9 @@ static gint dissect_query_afp_resolve_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { PAD(1); - proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_vol_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_file_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; decode_file_bitmap(tree, tvb, offset); @@ -2909,7 +2909,7 @@ dissect_query_afp_get_fork_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree * PAD(1); add_info_fork(tvb, pinfo, offset); - proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; decode_file_bitmap(tree, tvb, offset); @@ -2940,7 +2940,7 @@ dissect_query_afp_set_fork_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree * PAD(1); add_info_fork(tvb, pinfo, offset); - proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; bitmap = decode_file_bitmap(tree, tvb, offset); @@ -2951,7 +2951,7 @@ dissect_query_afp_set_fork_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree * offset += 8; } else { - proto_tree_add_item(tree, hf_afp_ofork_len, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_ofork_len, tvb, offset, 4, ENC_BIG_ENDIAN); param = tvb_get_ntohl(tvb, offset); col_append_fstr(pinfo->cinfo, COL_INFO, " Size=%d", param); offset += 4; @@ -2967,7 +2967,7 @@ dissect_query_afp_move(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint PAD(1); offset = decode_vol_did(tree, tvb, offset); - proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = decode_name_label(tree, pinfo, tvb, offset, "Source path: %s"); @@ -2985,7 +2985,7 @@ dissect_query_afp_exchange_file(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t PAD(1); offset = decode_vol_did(tree, tvb, offset); - proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = decode_name_label(tree, pinfo, tvb, offset, "Source path: %s"); @@ -3048,17 +3048,17 @@ dissect_query_afp_byte_lock(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t sub_tree = proto_item_add_subtree(item, ett_afp_lock_flags); } - proto_tree_add_item(sub_tree, hf_afp_lock_op, tvb, offset, 1,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_lock_from, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_lock_op, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_lock_from, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_lock_offset, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_lock_offset, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_afp_lock_len, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_lock_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; } @@ -3067,7 +3067,7 @@ dissect_query_afp_byte_lock(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t static gint dissect_reply_afp_byte_lock(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { - proto_tree_add_item(tree, hf_afp_lock_range_start, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_lock_range_start, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -3087,17 +3087,17 @@ dissect_query_afp_byte_lock_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre sub_tree = proto_item_add_subtree(item, ett_afp_lock_flags); } - proto_tree_add_item(sub_tree, hf_afp_lock_op, tvb, offset, 1,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_lock_from, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_lock_op, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_lock_from, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_lock_offset64, tvb, offset, 8,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_lock_offset64, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(tree, hf_afp_lock_len64, tvb, offset, 8,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_lock_len64, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; } @@ -3106,7 +3106,7 @@ dissect_query_afp_byte_lock_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static gint dissect_reply_afp_byte_lock_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { - proto_tree_add_item(tree, hf_afp_lock_range_start64, tvb, offset, 8,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_lock_range_start64, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -3119,10 +3119,10 @@ dissect_query_afp_add_cmt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g guint8 len; PAD(1); - proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = decode_name(tree, pinfo, tvb, offset); @@ -3131,7 +3131,7 @@ dissect_query_afp_add_cmt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g PAD(1); len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_afp_comment, tvb, offset, 1,ENC_UTF_8|ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_comment, tvb, offset, 1, ENC_UTF_8|ENC_BIG_ENDIAN); offset += len +1; return offset; @@ -3144,10 +3144,10 @@ dissect_query_afp_get_cmt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g { PAD(1); - proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = decode_name(tree, pinfo, tvb, offset); @@ -3161,7 +3161,7 @@ dissect_reply_afp_get_cmt(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre guint8 len; len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_afp_comment, tvb, offset, 1,ENC_UTF_8|ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_comment, tvb, offset, 1, ENC_UTF_8|ENC_BIG_ENDIAN); offset += len +1; return offset; @@ -3173,19 +3173,19 @@ dissect_query_afp_get_icon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr { PAD(1); - proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_UTF_8|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_UTF_8|ENC_NA); offset += 4; - proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4; - proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; PAD(1); - proto_tree_add_item(tree, hf_afp_icon_length, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_icon_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; @@ -3197,12 +3197,12 @@ dissect_query_afp_get_icon_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre { PAD(1); - proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4; - proto_tree_add_item(tree, hf_afp_icon_index, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_icon_index, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; @@ -3213,17 +3213,17 @@ static gint dissect_reply_afp_get_icon_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { - proto_tree_add_item(tree, hf_afp_icon_tag, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_icon_tag, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4; - proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; PAD(1); - proto_tree_add_item(tree, hf_afp_icon_length, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_icon_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; @@ -3235,22 +3235,22 @@ dissect_query_afp_add_icon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr { PAD(1); - proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4; - proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4,ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_type, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4; - proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_icon_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; PAD(1); - proto_tree_add_item(tree, hf_afp_icon_tag, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_icon_tag, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_afp_icon_length, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_icon_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; return offset; @@ -3264,11 +3264,11 @@ decode_dt_did(proto_tree *tree, tvbuff_t *tvb, gint offset) { /* FIXME it's not volume but dt cf decode_name*/ Vol = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; Did = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; } @@ -3281,10 +3281,10 @@ dissect_query_afp_add_appl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, PAD(1); offset = decode_dt_did(tree, tvb, offset); - proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4; - proto_tree_add_item(tree, hf_afp_appl_tag, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_appl_tag, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = decode_name(tree, pinfo, tvb, offset); @@ -3302,7 +3302,7 @@ dissect_query_afp_rmv_appl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, PAD(1); offset = decode_dt_did(tree, tvb, offset); - proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4; offset = decode_name(tree, pinfo, tvb, offset); @@ -3316,13 +3316,13 @@ dissect_query_afp_get_appl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr { PAD(1); - proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_dt_ref, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4,ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_file_creator, tvb, offset, 4, ENC_ASCII|ENC_NA); offset += 4; - proto_tree_add_item(tree, hf_afp_appl_index, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_appl_index, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; decode_file_bitmap(tree, tvb, offset); @@ -3335,7 +3335,7 @@ dissect_query_afp_get_appl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr static gint dissect_reply_afp_get_appl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { - proto_tree_add_item(tree, hf_afp_appl_tag, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_appl_tag, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -3345,7 +3345,7 @@ dissect_reply_afp_get_appl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr static gint dissect_query_afp_create_file(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) { - proto_tree_add_item(tree, hf_afp_create_flag, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_create_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; offset = decode_vol_did(tree, tvb, offset); @@ -3362,15 +3362,15 @@ dissect_query_afp_map_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree guint8 type; type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_afp_map_id_type, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_map_id_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if ( type < 5) { - proto_tree_add_item(tree, hf_afp_map_id, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_map_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else { - proto_tree_add_item(tree, hf_afp_UUID, tvb, offset, 16,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_UUID, tvb, offset, 16, ENC_BIG_ENDIAN); offset += 16; } @@ -3392,10 +3392,10 @@ dissect_reply_afp_map_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree len = tvb_get_guint8(tvb, offset +1); if (!len) { /* assume it's undocumented type 5 or 6 reply */ - proto_tree_add_item(tree, hf_afp_map_id_reply_type, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_map_id_reply_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_afp_map_id, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_map_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; size = 2; @@ -3433,7 +3433,7 @@ dissect_query_afp_map_name(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr int size; type = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_afp_map_name_type, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_map_name_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch (type) { case 5: /* use 16 bits length */ @@ -3481,14 +3481,14 @@ dissect_query_afp_disconnect_old_session(tvbuff_t *tvb, packet_info *pinfo _U_, PAD(1); - proto_tree_add_item(tree, hf_afp_session_token_type, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_session_token_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; len = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_afp_session_token_len, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_session_token_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_afp_session_token, tvb, offset, len,ENC_NA); + proto_tree_add_item(tree, hf_afp_session_token, tvb, offset, len, ENC_NA); offset += len; if (offset <= orig_offset) @@ -3506,23 +3506,23 @@ dissect_query_afp_get_session_token(tvbuff_t *tvb, packet_info *pinfo _U_, proto PAD(1); token = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_afp_session_token_type, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_session_token_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (token == kLoginWithoutID || token == kGetKerberosSessionKey) /* 0 || 8 */ return offset; len = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_afp_session_token_len, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_session_token_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; switch (token) { case kLoginWithTimeAndID: case kReconnWithTimeAndID: - proto_tree_add_item(tree, hf_afp_session_token_timestamp, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_session_token_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } - proto_tree_add_item(tree, hf_afp_session_token, tvb, offset, len,ENC_NA); + proto_tree_add_item(tree, hf_afp_session_token, tvb, offset, len, ENC_NA); offset += len; if (offset <= orig_offset) @@ -3542,15 +3542,15 @@ dissect_reply_afp_get_session_token(tvbuff_t *tvb, packet_info *pinfo _U_, proto size = 4; /* [cm]: FIXME continued: Since size is set to 4, this test is never true. if (size == 2) { - proto_tree_add_item(tree, hf_afp_session_token_type, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_session_token_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } */ len = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_afp_session_token_len, tvb, offset, size,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_session_token_len, tvb, offset, size, ENC_BIG_ENDIAN); offset += size; - proto_tree_add_item(tree, hf_afp_session_token, tvb, offset, len,ENC_NA); + proto_tree_add_item(tree, hf_afp_session_token, tvb, offset, len, ENC_NA); offset += len; if (offset <= orig_offset) @@ -3574,8 +3574,8 @@ dissect_query_afp_get_server_message(tvbuff_t *tvb, packet_info *pinfo _U_, prot item = proto_tree_add_item(tree, hf_afp_message_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_message_bitmap); - proto_tree_add_item(sub_tree, hf_afp_message_bitmap_REQ, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_message_bitmap_UTF, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_message_bitmap_REQ, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_message_bitmap_UTF, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -3601,8 +3601,8 @@ dissect_reply_afp_get_server_message(tvbuff_t *tvb, packet_info *pinfo _U_, prot item = proto_tree_add_item(tree, hf_afp_message_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_message_bitmap); - proto_tree_add_item(sub_tree, hf_afp_message_bitmap_REQ, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_message_bitmap_UTF, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_message_bitmap_REQ, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_message_bitmap_UTF, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -3614,10 +3614,10 @@ dissect_reply_afp_get_server_message(tvbuff_t *tvb, packet_info *pinfo _U_, prot if (bitmap & 0x02) { /* Message is UTF-8, and message length is 2 bytes */ len = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_afp_message_len, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_message_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; if (len) { - proto_tree_add_item(tree, hf_afp_message, tvb, offset, len ,ENC_UTF_8|ENC_NA); + proto_tree_add_item(tree, hf_afp_message, tvb, offset, len , ENC_UTF_8|ENC_NA); offset += len; } } else { @@ -3628,10 +3628,10 @@ dissect_reply_afp_get_server_message(tvbuff_t *tvb, packet_info *pinfo _U_, prot * or possibly some other encoding for other locales? */ len = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_afp_message_len, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_message_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (len) { - proto_tree_add_item(tree, hf_afp_message, tvb, offset, len ,ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_afp_message, tvb, offset, len , ENC_ASCII|ENC_NA); offset += len; } } @@ -3644,21 +3644,21 @@ static gint dissect_query_afp_get_user_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset) { - proto_tree_add_item(tree, hf_afp_user_flag, tvb, offset, 1,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_user_flag, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_afp_user_ID, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_user_ID, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if (tree) { proto_tree *sub_tree; proto_item *item; - item = proto_tree_add_item(tree, hf_afp_user_bitmap, tvb, offset, 2,ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_afp_user_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_user_bitmap); - proto_tree_add_item(sub_tree, hf_afp_user_bitmap_UID, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_user_bitmap_GID, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_user_bitmap_UUID, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_user_bitmap_UID, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_user_bitmap_GID, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_user_bitmap_UUID, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; @@ -3676,26 +3676,26 @@ dissect_reply_afp_get_user_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree *sub_tree; proto_item *item; - item = proto_tree_add_item(tree, hf_afp_user_bitmap, tvb, offset, 2,ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_afp_user_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_user_bitmap); - proto_tree_add_item(sub_tree, hf_afp_user_bitmap_UID, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_user_bitmap_GID, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_user_bitmap_UUID, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_user_bitmap_UID, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_user_bitmap_GID, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_user_bitmap_UUID, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; if ((bitmap & 1)) { - proto_tree_add_item(tree, hf_afp_user_ID, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_user_ID, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if ((bitmap & 2)) { - proto_tree_add_item(tree, hf_afp_group_ID, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_group_ID, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if ((bitmap & 4)) { - proto_tree_add_item(tree, hf_afp_UUID, tvb, offset, 16,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_UUID, tvb, offset, 16, ENC_BIG_ENDIAN); offset += 16; } return offset; @@ -3722,7 +3722,7 @@ decode_attr_name (proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint item = proto_tree_add_text(tree, tvb, offset, len + 2, label, name); sub_tree = proto_item_add_subtree(item, ett_afp_extattr_names); - proto_tree_add_item(sub_tree, hf_afp_extattr_namelen, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_extattr_namelen, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sub_tree, hf_afp_extattr_name, tvb, offset +2, len, ENC_UTF_8|ENC_NA); } offset += 2 +len; @@ -3739,11 +3739,11 @@ decode_attr_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) proto_tree *sub_tree; proto_item *item; - item = proto_tree_add_item(tree, hf_afp_extattr_bitmap, tvb, offset, 2,ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_afp_extattr_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_extattr_bitmap); - proto_tree_add_item(sub_tree, hf_afp_extattr_bitmap_NoFollow, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_extattr_bitmap_Create, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_extattr_bitmap_Replace, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_extattr_bitmap_NoFollow, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_extattr_bitmap_Create, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_extattr_bitmap_Replace, tvb, offset, 2, ENC_BIG_ENDIAN); } offset += 2; return offset; @@ -3759,10 +3759,10 @@ dissect_query_afp_get_ext_attr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr offset = decode_attr_bitmap(tree, tvb, offset); /* 8byte offset */ - proto_tree_add_item(tree, hf_afp_offset64, tvb, offset, 8,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_offset64, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* 8byte reqcount */ - proto_tree_add_item(tree, hf_afp_reqcount64, tvb, offset, 8,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_reqcount64, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; /* maxreply */ @@ -3787,7 +3787,7 @@ dissect_reply_afp_get_ext_attr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset = decode_attr_bitmap(tree, tvb, offset); len = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_afp_extattr_len, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_extattr_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; remain = tvb_reported_length_remaining(tvb, offset); @@ -3814,7 +3814,7 @@ dissect_query_afp_set_ext_attr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr offset = decode_attr_bitmap(tree, tvb, offset); /* 8byte offset */ - proto_tree_add_item(tree, hf_afp_offset64, tvb, offset, 8,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_offset64, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; offset = decode_name(tree, pinfo, tvb, offset); @@ -3822,7 +3822,7 @@ dissect_query_afp_set_ext_attr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr offset = decode_attr_name(tree, pinfo, tvb, offset, "Attribute: %s"); len = tvb_get_ntohl(tvb, offset); - proto_tree_add_item(tree, hf_afp_extattr_len, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_extattr_len, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_afp_extattr_data, tvb, offset, len, ENC_NA); @@ -3922,24 +3922,24 @@ decode_acl_access_bitmap(tvbuff_t *tvb, proto_tree *tree, gint offset) item = proto_tree_add_item(tree, hf_afp_acl_access_bitmap, tvb, offset, 4, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_acl_access_bitmap); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_read_data , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_write_data , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_execute , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_delete , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_append_data , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_delete_child , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_read_attrs , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_write_attrs , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_read_extattrs , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_write_extattrs , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_read_security , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_write_security , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_change_owner , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_synchronize , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_generic_all , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_generic_execute, tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_generic_write , tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_generic_read , tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_read_data , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_write_data , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_execute , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_delete , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_append_data , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_delete_child , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_read_attrs , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_write_attrs , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_read_extattrs , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_write_extattrs , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_read_security , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_write_security , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_change_owner , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_synchronize , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_generic_all , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_generic_execute, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_generic_write , tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_access_bitmap_generic_read , tvb, offset, 4, ENC_BIG_ENDIAN); } return bitmap; @@ -3973,7 +3973,7 @@ dissect_query_afp_with_did(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr PAD(1); offset = decode_vol_did(tree, tvb, offset); - proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_did, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -4000,18 +4000,18 @@ spotlight_int64(tvbuff_t *tvb, proto_tree *tree, gint offset, guint encoding) { gint count, i; guint64 query_data64; - + query_data64 = spotlight_ntoh64(tvb, offset, encoding); count = query_data64 >> 32; offset += 8; - + i = 0; while (i++ < count) { query_data64 = spotlight_ntoh64(tvb, offset, encoding); proto_tree_add_text(tree, tvb, offset, 8, "int64: 0x%016" G_GINT64_MODIFIER "x", query_data64); offset += 8; - } - + } + return count; } @@ -4021,18 +4021,18 @@ spotlight_float(tvbuff_t *tvb, proto_tree *tree, gint offset, guint encoding) gint count, i; guint64 query_data64; gdouble fval; - + query_data64 = spotlight_ntoh64(tvb, offset, encoding); count = query_data64 >> 32; offset += 8; - + i = 0; while (i++ < count) { fval = spotlight_ntohieee_double(tvb, offset, encoding); proto_tree_add_text(tree, tvb, offset, 8, "float: %f", fval); offset += 8; - } - + } + return count; } @@ -4054,7 +4054,7 @@ spotlight_CNID_array(tvbuff_t *tvb, proto_tree *tree, gint offset, guint encodin proto_tree_add_text(tree, tvb, offset + 4, 4, "unknown2: 0x%08" G_GINT32_MODIFIER "x", unknown2); offset += 8; - + while (count --) { query_data64 = spotlight_ntoh64(tvb, offset, encoding); @@ -4062,7 +4062,7 @@ spotlight_CNID_array(tvbuff_t *tvb, proto_tree *tree, gint offset, guint encodin query_data64); offset += 8; } - + return 0; } @@ -4138,7 +4138,7 @@ spotlight_dissect_query_loop(tvbuff_t *tvb, proto_tree *tree, gint offset, guint break; } query_type = (query_data64 & 0xffff0000) >> 16; - + switch (query_type) { case SQ_TYPE_COMPLEX: toc_index = (gint)((query_data64 >> 32) - 1); @@ -4175,7 +4175,7 @@ spotlight_dissect_query_loop(tvbuff_t *tvb, proto_tree *tree, gint offset, guint subquery_count); break; } - + sub_tree = proto_item_add_subtree(item_query, ett_afp_spotlight_query_line); offset += 8; offset = spotlight_dissect_query_loop(tvb, sub_tree, offset, complex_query_type, subquery_count, toc_offset, encoding); @@ -4233,7 +4233,7 @@ spotlight_dissect_query_loop(tvbuff_t *tvb, proto_tree *tree, gint offset, guint } count--; } - + return offset; } @@ -4246,7 +4246,7 @@ dissect_spotlight(tvbuff_t *tvb, proto_tree *tree, gint offset) guint64 querylen; gint toc_entries; guint64 toc_entry; - + proto_item *item_queries_data; proto_tree *sub_tree_queries; proto_item *item_toc; @@ -4378,8 +4378,8 @@ dissect_spotlight(tvbuff_t *tvb, proto_tree *tree, gint offset) spotlight_get_cpx_qtype_string((toc_entry & 0xffff0000) >> 16), (toc_entry & 0xffff) * 8); } - - + + } return offset; @@ -4415,10 +4415,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,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_spotlight_volflags, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_afp_spotlight_reqlen, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_spotlight_reqlen, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = dissect_spotlight(tvb, tree, offset); @@ -4439,13 +4439,13 @@ decode_acl_list_bitmap(tvbuff_t *tvb, proto_tree *tree, gint offset) proto_tree *sub_tree; proto_item *item; - item = proto_tree_add_item(tree, hf_afp_acl_list_bitmap, tvb, offset, 2,ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_afp_acl_list_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_acl_list_bitmap); - proto_tree_add_item(sub_tree, hf_afp_acl_list_bitmap_UUID, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_list_bitmap_GRPUUID, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_list_bitmap_ACL, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_list_bitmap_REMOVEACL, tvb, offset, 2,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_acl_list_bitmap_Inherit, tvb, offset, 2,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_list_bitmap_UUID, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_list_bitmap_GRPUUID, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_list_bitmap_ACL, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_list_bitmap_REMOVEACL, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_acl_list_bitmap_Inherit, tvb, offset, 2, ENC_BIG_ENDIAN); } return bitmap; @@ -4463,15 +4463,15 @@ decode_ace_flags_bitmap(tvbuff_t *tvb, proto_tree *tree, gint offset) proto_tree *sub_tree; proto_item *item; - item = proto_tree_add_item(tree, hf_afp_ace_flags, tvb, offset, 4,ENC_BIG_ENDIAN); + item = proto_tree_add_item(tree, hf_afp_ace_flags, tvb, offset, 4, ENC_BIG_ENDIAN); sub_tree = proto_item_add_subtree(item, ett_afp_ace_flags); - proto_tree_add_item(sub_tree, hf_afp_ace_flags_allow, tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_ace_flags_deny, tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_ace_flags_inherited, tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_ace_flags_fileinherit, tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_ace_flags_dirinherit, tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_ace_flags_limitinherit, tvb, offset, 4,ENC_BIG_ENDIAN); - proto_tree_add_item(sub_tree, hf_afp_ace_flags_onlyinherit, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_ace_flags_allow, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_ace_flags_deny, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_ace_flags_inherited, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_ace_flags_fileinherit, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_ace_flags_dirinherit, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_ace_flags_limitinherit, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_afp_ace_flags_onlyinherit, tvb, offset, 4, ENC_BIG_ENDIAN); } return bitmap; @@ -4482,7 +4482,7 @@ decode_kauth_ace(tvbuff_t *tvb, proto_tree *tree, gint offset) { /* FIXME: preliminary decoding... */ if (tree) { - proto_tree_add_item(tree, hf_afp_UUID, tvb, offset, 16,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_UUID, tvb, offset, 16, ENC_BIG_ENDIAN); offset += 16; decode_ace_flags_bitmap(tvb, tree, offset); @@ -4500,8 +4500,8 @@ decode_kauth_ace(tvbuff_t *tvb, proto_tree *tree, gint offset) static gint decode_kauth_acl(tvbuff_t *tvb, proto_tree *tree, gint offset) { - int entries; - int i; + int entries; + int i; proto_tree *sub_tree; proto_tree *ace_tree; proto_item *item; @@ -4513,7 +4513,7 @@ decode_kauth_acl(tvbuff_t *tvb, proto_tree *tree, gint offset) sub_tree = proto_item_add_subtree(item, ett_afp_ace_entries); offset += 4; - proto_tree_add_item(tree, hf_afp_acl_flags, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_acl_flags, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; for (i = 0; i < entries; i++) { @@ -4578,7 +4578,7 @@ dissect_query_afp_get_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g decode_acl_list_bitmap(tvb, tree, offset); offset += 2; - proto_tree_add_item(tree, hf_afp_max_reply_size32, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_max_reply_size32, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = decode_name(tree, pinfo, tvb, offset); @@ -4609,7 +4609,7 @@ dissect_reply_afp_spotlight(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t switch (request_val->spotlight_req_command) { case SPOTLIGHT_CMD_GET_VOLPATH: - proto_tree_add_item(tree, hf_afp_spotlight_returncode, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_spotlight_returncode, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; tvb_get_ephemeral_stringz(tvb, offset, &len);; @@ -4618,12 +4618,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,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_spotlight_volflags, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; case SPOTLIGHT_CMD_GET_THREE: - proto_tree_add_item(tree, hf_afp_spotlight_returncode, tvb, offset, 4,ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_afp_spotlight_returncode, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = dissect_spotlight(tvb, tree, offset); @@ -4699,7 +4699,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_item(tree, proto_afp, tvb, offset, -1,ENC_NA); + ti = proto_tree_add_item(tree, proto_afp, tvb, offset, -1, ENC_NA); afp_tree = proto_item_add_subtree(ti, ett_afp); } if (!aspinfo->reply) { |