from Sid

updates to FTAM


svn path=/trunk/; revision=13966

1 files changed, 165 insertions, 1 deletions

diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index 90eaa400eb..2c8207634c 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -135,6 +135,164 @@ static int hf_nbs9_read_future_filesize						= -1;
 static int hf_nbs9_read_access_control						= -1;
 static int hf_nbs9_read_legal_qualifications				= -1;
 static int hf_nbs9_read_private_use							= -1;
+static const value_string ftam_error_messages[] =
+{
+  {ERROR_MESSAGE_FTAM_NO_REASON,  "No reason" },
+  {ERROR_MESSAGE_FTAM_RESPONDER_ERROR,  "Responder error (unspecific)" },
+  {ERROR_MESSAGE_FTAM_SYSTEM_SHUTDOWN,  "System shutdown" },
+  {ERROR_MESSAGE_FTAM_MANAGEMENT_PROBLEM_U,  "FTAM management problem (unspecific)" },
+  {ERROR_MESSAGE_FTAM_MANAGEMENT_PROBLEM_BA,  "FTAM management, bad account" },
+  {ERROR_MESSAGE_FTAM_MANAGEMENT_PROBLEM_SC,  "FTAM management, security not passed" },
+  {ERROR_MESSAGE_DELAY_MAYBE_ENCOUNTERED,  "Delay may be encountered" },
+  {ERROR_MESSAGE_INITIATOR_ERROR,  "Initiator error (unspecific)" },
+  {ERROR_MESSAGE_SUBSEQUENT_ERROR,  "Subsequent error" },
+  {ERROR_MESSAGE_TEMPORAL_INSUFFICIENCY_OF_RESOURCES,  "Temporal insufficiency of resources" },
+  {ERROR_MESSAGE_ACCESS_REQUEST_VIOLATES_VFS_SECURITY,  "Access request violates VFS security" },
+  {ERROR_MESSAGE_ACCESS_REQUEST_VIOLATES_LOCAL_SECURITY,  "Access request violates local security" },
+
+  {ERROR_MESSAGE_CONFLICTING_PARAMETER_VALUE,  "Conflicting parameter value" },
+  {ERROR_MESSAGE_UNSUPPORTED_PARAMETER_VALUE,  "Unsupported parameter value" },
+  {ERROR_MESSAGE_MANDATORY_PARAMETER_NOT_SET,  "Mandatory parameter not set" },
+  {ERROR_MESSAGE_UNSUPPORTED_PARAMETER,  "Unsupported parameter" },
+  {ERROR_MESSAGE_DUBLICATED_PARAMETER,  "Duplicated parameter" },
+  {ERROR_MESSAGE_ILLEGAL_PARAMETER_TYPE,  "Illegal parameter type" },
+  {ERROR_MESSAGE_UNSUPPORTED_PARAMETER_TYPE,  "Unsupported parameter type" },
+  {ERROR_MESSAGE_FTAM_PROTOCOL_ERROR_U,  "FTAM protocol error (unspecific)" },
+  {ERROR_MESSAGE_FTAM_PROTOCOL_ERROR_PE,  "FTAM protocol error, procedure error" },
+  {ERROR_MESSAGE_FTAM_PROTOCOL_ERROR_FUE,  "FTAM protocol error, functional unit error" },
+  {ERROR_MESSAGE_FTAM_PROTOCOL_ERROR_CE,  "FTAM protocol error, corruption error" },
+  {ERROR_MESSAGE_FTAM_LOWER_LAYER_FAILURE,  "Lower layer failure" },
+  {ERROR_MESSAGE_FTAM_LOWER_ADDRESING_ERROR,  "Lower layer addressing error" },
+  {ERROR_MESSAGE_FTAM_TIMEOUT,  "Timeout" },
+  {ERROR_MESSAGE_FTAM_SYSTEM_SHUTDOWN_,  "System shutdown" },
+  {ERROR_MESSAGE_FTAM_ILLEGAL_GROUPING_SEQUENCE,  "Illegal grouping sequence" },
+  {ERROR_MESSAGE_GROUPING_THRESHHOLD_VIOLATION,  "Grouping threshold violation" },
+  {ERROR_MESSAGE_SPECIFIC_PDU_REQUEST_INCONSISTENT,  "Specific PDU request inconsistent with the current requested access" },
+
+  {ERROR_MESSAGE_ASSOCIATION_WITH_USER_NOT_ALLOWED,  "Association with user not allowed" },
+  {ERROR_MESSAGE_NOT_ASSIGNED,  "not assigned" },
+  {ERROR_MESSAGE_UNSUPPORTED_SERVICE_CLASS,  "Unsupported service class" },
+  {ERROR_MESSAGE_UNSUPPORTED_FUNCTIONAL_UNIT,  "Unsupported functional unit" },
+  {ERROR_MESSAGE_ATTRIBUTE_GROUP_ERROR,  "Attribute group error (unspecific)" },
+  {ERROR_MESSAGE_ATTRIBUTE_GROUP_NOT_ALLOWED,  "Attribute group not allowed" },
+  {ERROR_MESSAGE_BAD_ACCOUNT,  "Bad account" },
+  {ERROR_MESSAGE_ASSOC_MANAGEMENT,  "Association management (unspecific)" },
+  {ERROR_MESSAGE_ASSOC_MANAGEMENT_BA,  "Association management, bad address" },
+  {ERROR_MESSAGE_ASSOC_MANAGEMENT_BAC,  "Association management, bad account" },
+  {ERROR_MESSAGE_CHECKPOINT_W_E_TL,  "Checkpoint window error, too large" },
+  {ERROR_MESSAGE_CHECKPOINT_W_E_TS,  "Checkpoint window error, too small" },
+  {ERROR_MESSAGE_CHECKPOINT_W_E_UN , "Checkpoint window error, unsupported" },
+  {ERROR_MESSAGE_COMMUNICATION_QOS_NOT_SUPPORTED,  "Communications QoS not supported" },
+  {ERROR_MESSAGE_INITIATOR_IDENTITY_UNACCEPTABLE,  "Initiator identity unacceptable" },
+  {ERROR_MESSAGE_CONTEXT_MANAGEMENT_REFUSED,  "Context management refused" },
+  {ERROR_MESSAGE_ROLLBACK_NOT_AVAILABLE,  "Rollback not available " },
+  {ERROR_MESSAGE_CONTENTS_TYPE_LIST_CUT_BY_R,  "Contents type list cut by responder " },
+  {ERROR_MESSAGE_CONTENTS_TYPE_LIST_CUT_BY_P,  "Contents type list cut by Presentation service" },
+  {ERROR_MESSAGE_INVALID_FILESTORE_PASSWORD,  "Invalid filestore password" },
+  {ERROR_MESSAGE_INCOMPATABLE_SERVICE_CLASS,  "Incompatible service class" },
+
+  {ERROR_MESSAGE_FILENAME_NOT_FOUND,  "Filename not found" },
+  {ERROR_MESSAGE_SELECTION_ATTRIBUTES_NOT_MATCHED,  "Selection attributes not matched" },
+  {ERROR_MESSAGE_INITIAL_ATTRIBUTES_NOT_POSSIBLE,  "Initial attributes not possible" },
+  {ERROR_MESSAGE_BAD_ATTRIBUTE_NAME,  "Bad attribute name" },
+  {ERROR_MESSAGE_NON_EXISTENT_FILE,  "Non-existent file" },
+  {ERROR_MESSAGE_FILE_ALREADY_EXISTS,  "File already exists" },
+  {ERROR_MESSAGE_FILE_CANNOT_BE_CREATED,  "File cannot be created" },
+  {ERROR_MESSAGE_FILE_CANNOT_BE_DELETED,  "File cannot be deleted" },
+  {ERROR_MESSAGE_CONCURRENCY_CONTROL_NOT_AVAILABLE,  "Concurrency control not available" },
+  {ERROR_MESSAGE_CONCURRENCY_CONTROL_NOT_SUPPORTED,  "Concurrency control not supported" },
+  {ERROR_MESSAGE_CONCURRENCY_CONTROL_NOT_POSSIBLE,  "Concurrency control not possible" },
+  {ERROR_MESSAGE_MORE_RESTRICTIVE_LOCK,  "More restrictive lock" },
+  {ERROR_MESSAGE_FILE_BUSY,  "File busy" },
+  {ERROR_MESSAGE_ACCESS_CONTROL_NOT_AVAILABLE,  "Access control not available" },
+  {ERROR_MESSAGE_ACCESS_CONTROL_NOT_SUPPORTED,  "Access control not supported" },
+  {ERROR_MESSAGE_ACCESS_CONTROL_INCONSISTENT,  "Access control not inconsistent" },  
+  {ERROR_MESSAGE_FILENAME_TRUNCATED,  "Filename truncated" },  
+  {ERROR_MESSAGE_INITIAL_ATTRIBUTES_ALTERED,  "Initial attributes altered" },  
+  {ERROR_MESSAGE_BAD_ACCOUNT_,  "Bad account" },  
+  {ERROR_MESSAGE_OVERRIDE_SELECTED_EXISTING_FILE,  "Override selected existing file" },  
+  {ERROR_MESSAGE_OVERRIDE_DELETED_AND_RECREATED_FILE_OLD,  "Override deleted and recreated file with old attributes" },  
+  {ERROR_MESSAGE_OVERRIDE_DELETED_AND_RECREATED_FILE_NEW,  "Override deleted and recreated file with new attributes" },  
+  {ERROR_MESSAGE_CREATE_OVERRIDE_NOT_POSSIBLE,  "Create override, not possible" },  
+  {ERROR_MESSAGE_AMBIGUOUS_FILE_SPECIFICATION,  "Ambiguous file specification" },  
+  {ERROR_MESSAGE_INVALID_CREATE_PASSWORD,  "Invalid create password" },  
+  {ERROR_MESSAGE_INVALID_DELETE_PASSWORD,  "Invalid delete password on override" },  
+  {ERROR_MESSAGE_BAD_ATTRIBUTE_VALUE,  "Bad attribute value" },  
+  {ERROR_MESSAGE_REQUESTED_ACCESS_VIOLATES_PERMITTED_ACTIONS,  "Requested access violates permitted actions" },  
+  {ERROR_MESSAGE_REQUESTED_FUNCTIONAL_UNIT_NOT_AVAILABLE,  "Functional unit not available for requested access" },  
+  {ERROR_MESSAGE_REQUESTED_FILE_CREATED_BUT_NOT_SELECTED,  "File created but not selected" },  
+
+  {ERROR_MESSAGE_ATTRIBUTE_NON_EXISTENT,  "Attribute non existent" },  
+  {ERROR_MESSAGE_ATTRIBUTE_CANNOT_BE_READ,  "Attribute cannot be read" },  
+  {ERROR_MESSAGE_ATTRIBUTE_CANNOT_BE_CHANGED,  "Attribute cannot be changed" },  
+  {ERROR_MESSAGE_ATTRIBUTE_NOT_SUPPORTED,  "Attribute not supported" },  
+  {ERROR_MESSAGE_BAD_ATTRIBUTE_NAME_,  "Bad attribute name" },  
+  {ERROR_MESSAGE_BAD_ATTRIBUTE_VALUE_,  "Bad attribute value" },  
+  {ERROR_MESSAGE_ATTRIBUTE_PARTIALLY_SUPPORTED,  "Attribute partially supported" },  
+  {ERROR_MESSAGE_ADDITIONAL_SET_ATTRIBUTE_,  "Additional set attribute value not distinct" },  
+
+  {ERROR_MESSAGE_ARD_BAD_FADU_U,  "Bad FADU (unspecific)" },  
+  {ERROR_MESSAGE_ARD_BAD_FADU_SIZE_ERROR,  "Bad FADU - size error" },  
+  {ERROR_MESSAGE_ARD_BAD_FADU_TYPE_ERROR,  "Bad FADU - type error" },  
+  {ERROR_MESSAGE_ARD_BAD_FADU_POORLY_SPECIFIED,  "Bad FADU - poorly specified" },  
+  {ERROR_MESSAGE_ARD_BAD_FADU_BAD_LOCATION,  "Bad FADU - bad location" },  
+  {ERROR_MESSAGE_ARD_FADU_DOES_NOT_EXIST,  "FADU does not exist" },  
+  {ERROR_MESSAGE_ARD_FADU_NOT_AVAILABLE_U,  "FADU not available (unspecific)" },  
+  {ERROR_MESSAGE_ARD_FADU_NOT_AVAILABLE_R,  "FADU not available for reading" },  
+  {ERROR_MESSAGE_ARD_FADU_NOT_AVAILABLE_W,  "FADU not available for writing" },  
+  {ERROR_MESSAGE_ARD_FADU_NOT_AVAILABLE_L,  "FADU not available for location" },  
+  {ERROR_MESSAGE_ARD_FADU_NOT_AVAILABLE_E,  "FADU not available for erasure" },  
+  {ERROR_MESSAGE_ARD_FADU_CAN_NOT_BE_INSERTED,  "FADU cannot be insterted" },  
+  {ERROR_MESSAGE_ARD_FADU_CAN_NOT_BE_REPLACED,  "FADU cannot be replaced" },  
+  {ERROR_MESSAGE_ARD_FADU_CAN_NOT_BE_LOCATED,  "FADU cannot be located" },    
+  {ERROR_MESSAGE_ARD_BAD_DATA_ELEMENT_TYPE,  "Bad data element type" },    
+  {ERROR_MESSAGE_ARD_OPERATION_NOT_AVAILABLE,  "Operation not available" },    
+  {ERROR_MESSAGE_ARD_OPERATION_NOT_SUPPORTED,  "Operation not supported" },    
+  {ERROR_MESSAGE_ARD_OPERATION_NOT_INCONSISTENT,  "Operation not inconsistent" },    
+  {ERROR_MESSAGE_ARD_CONCURENCY_CONTROL_NOT_AVAILABLE,  "Concurrency control not available" },    
+  {ERROR_MESSAGE_ARD_CONCURENCY_CONTROL_NOT_SUPPORTED,  "Concurrency control not supported" },    
+  {ERROR_MESSAGE_ARD_CONCURENCY_CONTROL_NOT_INCONSISTENT,  "Concurrency control not inconsistent" },    
+  {ERROR_MESSAGE_ARD_PROCESSING_MODE_NOT_AVAILABLE,  "Processing mode not available" },    
+  {ERROR_MESSAGE_ARD_PROCESSING_MODE_NOT_SUPPORTED,  "Processing mode not supported" },    
+  {ERROR_MESSAGE_ARD_PROCESSING_MODE_NOT_INCONSISTENT,  "Processing mode not inconsistent" },    
+  {ERROR_MESSAGE_ARD_ACCESS_CONTEXT_NOT_AVAILABLE,  "Access context not available" },    
+  {ERROR_MESSAGE_ARD_ACCESS_CONTEXT_NOT_SUPPORTED,  "Access context not supported" },    
+  {ERROR_MESSAGE_ARD_BAD_WRITE_U,  "Bad write (unspecific)" },    
+  {ERROR_MESSAGE_ARD_BAD_READ_U,  "Bad read (unspecific)" },    
+  {ERROR_MESSAGE_ARD_LOCAL_FAILURE_U,  "Local failure (unspecific)" },    
+  {ERROR_MESSAGE_ARD_LOCAL_FAILURE_FE,  "Local failure - filespace exhausted" },    
+  {ERROR_MESSAGE_ARD_LOCAL_FAILURE_DC,  "Local failure - data corrupted" },    
+  {ERROR_MESSAGE_ARD_LOCAL_FAILURE_DF,  "Local failure - device failure" },      
+  {ERROR_MESSAGE_ARD_FUTURE_FILE_SIZE_EXCEEDED,  "Future file size exceeded" },      
+  {ERROR_MESSAGE_ARD_FUTURE_FILE_SIZE_INCREASED,  "Future file size increased" },      
+  {ERROR_MESSAGE_ARD_FUNCTIONAL_UNIT_INVALID,  "Functional unit invalid in processing mode" },      
+  {ERROR_MESSAGE_ARD_CONTENTS_TYPE_INCONSISTENT,  "Contents type inconsistent" },      
+  {ERROR_MESSAGE_ARD_CONTENTS_TYPE_SIMPLIFIED,  "Contents type simplified" },      
+  {ERROR_MESSAGE_ARD_DUBLICATE_FADU_NAME,  "Duplicate FADU name" },      
+  {ERROR_MESSAGE_ARD_DAMAGE_TO_SO,  "Damage to select/open regime" },      
+  {ERROR_MESSAGE_ARD_FADU_LOCKING_NOT_A,  "FADU locking not available on file" },      
+  {ERROR_MESSAGE_ARD_FADU_LOCKED_BY_ANOTHER_USER,  "FADU locked by another user" },      
+
+  {ERROR_MESSAGE_RR_BAD_CHECKPOINT,  "Bad checkpoint (unspecific)" },      
+  {ERROR_MESSAGE_RR_ACTIVITY_NOT_UNIQUE,  "Activity not unique" },      
+  {ERROR_MESSAGE_RR_CHECKPOINT_OUTSIDE_WINDOW,  "Checkpoint outside window" },      
+  {ERROR_MESSAGE_RR_ACTIVITY_NO_LONGER_EXISTS,  "Activity no longer exists" },      
+  {ERROR_MESSAGE_RR_ACTIVITY_NO_LONGER_RECOGNIZED,  "Activity not recognized" },      
+  {ERROR_MESSAGE_RR_ACTIVITY_NO_DOCKET,  "No docket" },      
+  {ERROR_MESSAGE_RR_ACTIVITY_CORRUPT_DOCKET,  "Corrupt docket" },      
+  {ERROR_MESSAGE_RR_FILE_WAITING_RESTART,  "File waiting restart" },      
+  {ERROR_MESSAGE_RR_BAD_RECOVERY_POINT,  "Bad recovery point" },      
+  {ERROR_MESSAGE_RR_NON_EXISTENT_RECOVERY_POINT,  "Non-existent recovery point" },      
+  {ERROR_MESSAGE_RR_RECOVERY_MODE_NOT_AVAILABLE,  "Recovery mode not available" },      
+  {ERROR_MESSAGE_RR_RECOVERY_MODE_INCONSISTENT,  "Recovery mode inconsistent" },      
+  {ERROR_MESSAGE_RR_RECOVERY_MODE_REDUCE,  "Recovery mode not reduce" },      
+  {ERROR_MESSAGE_RR_ACCESS_CONTROL_NOT_A,  "Access control not available" },      
+  {ERROR_MESSAGE_RR_ACCESS_CONTROL_NOT_S,  "Access control not supported" },      
+  {ERROR_MESSAGE_RR_ACCESS_CONTROL_I,  "Access control not inconsistent" },      
+  {ERROR_MESSAGE_RR_CONTENTS_TYPE_I,  "Contents type inconsistent" },      
+  {ERROR_MESSAGE_RR_CONTENTS_TYPE_S,  "Contents type simplified" },      
+  {0,             NULL           }
+};
 
 static const value_string ftam_data_vals[] =
 {
@@ -159,6 +317,7 @@ static const value_string ftam_pdu_vals[] =
   {FTAM_F_TERMINATE_REQUEST,  "f-terminate request" },
   {FTAM_F_TERMINATE_RESPONSE,  "f-terminate response" },
   {FTAM_F_U_ABORT_REQUEST,  "f-u-abort request" },
+  {FTAM_F_P_ABORT_REQUEST,  "f-p-abort request" },
   {FTAM_F_SELECT_REQUEST,  "f-select request" },
   {FTAM_F_SELECT_RESPONSE,  "f-select response" },
   {FTAM_F_DESELECT_REQUEST,  "f-deselect request" },
@@ -1458,7 +1617,8 @@ show_error_identifier(ASN1_SCK *asn,proto_tree
 				*offset = asn->offset;
 				proto_tree_add_text(ftam_tree, tvb, (*offset)-item_len,
 										item_len,
-										"Integer value: %u",value);
+										"Integer value: (%u) %s",value,
+										val_to_str(value, ftam_error_messages, "Unknown ftam error code (%d)"));
 		}
 }
 static void
@@ -1589,6 +1749,10 @@ show_diagnostic_seq(ASN1_SCK *asn,proto_tree
 			case FTAM_ERROR_SOURCE:
 				show_entity_reference(asn,ftam_tree_ms,tvb,offset,new_item_len);
 				break;
+			case FTAM_SUGGESTED_DELAY:
+				*offset = old_offset+new_item_len+header_len;
+				item_len-=new_item_len+header_len;
+				break;
 			default:
 					proto_tree_add_text(ftam_tree_ms, tvb, *offset, new_item_len+(asn->offset-*offset),
 					"Unknown asn.1 parameter: (0x%02x)", type);