aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Grange <robionekenobi@bluewin.ch>2014-12-27 17:46:33 +0100
committerAnders Broman <a.broman58@gmail.com>2015-01-08 09:32:59 +0000
commita323f0ce3ed46bba7f593790da2256180ac479f2 (patch)
tree6fc2f1e51e4ae7d62368b2031ff6b49315be6e50
parent37e64d83cd998df46ad57672fd44fca04c4d604c (diff)
packet-mq: Add New Def, Reformat Lines, re-order val_str def
Add missing definition, add new definition, Reformat some lines Re-order the value_string used with ext_value_string definition so they are in asc ASCII order as the ext_value_string is now sorted before first use renamed own tvb_get... funct to new tvb_get_guintxx funct and deleted own tvb_get... funct use ptvcursor_ funct instead of own macro to increment offset removed <epan/tvbuff.h> in *.c files correct [-Wunused-const-variable] Change-Id: Iaee26289e098cde0e5787ca1c98de64b6b733fa2 Reviewed-on: https://code.wireshark.org/review/6079 Reviewed-by: Robert Grange <robionekenobi@bluewin.ch> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat
-rw-r--r--epan/dissectors/packet-mq-base.c583
-rw-r--r--epan/dissectors/packet-mq-pcf.c66
-rw-r--r--epan/dissectors/packet-mq.c299
-rw-r--r--epan/dissectors/packet-mq.h79
4 files changed, 628 insertions, 399 deletions
diff --git a/epan/dissectors/packet-mq-base.c b/epan/dissectors/packet-mq-base.c
index a7c6078140..801af77ec1 100644
--- a/epan/dissectors/packet-mq-base.c
+++ b/epan/dissectors/packet-mq-base.c
@@ -25,47 +25,21 @@
#include "config.h"
#include <epan/packet.h>
+
#include "packet-mq.h"
-guint64 tvb_get_guint64_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep)
-{
- guint64 iResult;
- if (a_rep & ENC_LITTLE_ENDIAN)
- iResult = tvb_get_letoh64(a_tvb, a_iOffset);
- else
- iResult = tvb_get_ntoh64(a_tvb, a_iOffset);
- return iResult;
-}
-guint32 tvb_get_guint32_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep)
-{
- guint32 iResult;
- if (a_rep & ENC_LITTLE_ENDIAN)
- iResult = tvb_get_letohl(a_tvb, a_iOffset);
- else
- iResult = tvb_get_ntohl(a_tvb, a_iOffset);
- return iResult;
-}
-guint16 tvb_get_guint16_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep)
-{
- guint16 sResult;
- if (a_rep & ENC_LITTLE_ENDIAN)
- sResult = tvb_get_letohs(a_tvb, a_iOffset);
- else
- sResult = tvb_get_ntohs(a_tvb, a_iOffset);
- return sResult;
-}
/* This routine truncates the string at the first blank space */
gint32 strip_trailing_blanks(guint8* a_str, guint32 a_size)
{
gint32 i = 0;
if (a_str != NULL)
{
- for (i = a_size-1; i >=0; i--)
+ for (i = a_size - 1; i >= 0; i--)
{
if (a_str[i] != ' ' && a_str[i] != '\0')
break;
else
- a_str[i]='\0';
+ a_str[i] = '\0';
}
}
return i;
@@ -1991,6 +1965,7 @@ DEF_VALSE;
DEF_VALSBX(PrmId)
DEF_VALS1(MQBACF_ACCOUNTING_TOKEN ),
+ DEF_VALS1(MQBACF_ALTERNATE_SECURITYID ),
DEF_VALS1(MQBACF_CF_LEID ),
DEF_VALS1(MQBACF_CONNECTION_ID ),
DEF_VALS1(MQBACF_CORREL_ID ),
@@ -2000,17 +1975,37 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQBACF_EXTERNAL_UOW_ID ),
DEF_VALS1(MQBACF_GENERIC_CONNECTION_ID ),
DEF_VALS1(MQBACF_GROUP_ID ),
+ DEF_VALS1(MQBACF_MESSAGE_DATA ),
+ DEF_VALS1(MQBACF_MQBO_STRUCT ),
+ DEF_VALS1(MQBACF_MQCBC_STRUCT ),
+ DEF_VALS1(MQBACF_MQCBD_STRUCT ),
+ DEF_VALS1(MQBACF_MQCB_FUNCTION ),
+ DEF_VALS1(MQBACF_MQCD_STRUCT ),
+ DEF_VALS1(MQBACF_MQCNO_STRUCT ),
+ DEF_VALS1(MQBACF_MQGMO_STRUCT ),
+ DEF_VALS1(MQBACF_MQMD_STRUCT ),
+ DEF_VALS1(MQBACF_MQPMO_STRUCT ),
+ DEF_VALS1(MQBACF_MQSD_STRUCT ),
+ DEF_VALS1(MQBACF_MQSTS_STRUCT ),
DEF_VALS1(MQBACF_MSG_ID ),
DEF_VALS1(MQBACF_ORIGIN_UOW_ID ),
DEF_VALS1(MQBACF_Q_MGR_UOW_ID ),
DEF_VALS1(MQBACF_RESPONSE_ID ),
DEF_VALS1(MQBACF_RESPONSE_SET ),
+ DEF_VALS1(MQBACF_SUB_CORREL_ID ),
DEF_VALS1(MQBACF_SUB_ID ),
+ DEF_VALS1(MQBACF_XA_XID ),
+ DEF_VALS1(MQBACF_XQH_CORREL_ID ),
+ DEF_VALS1(MQBACF_XQH_MSG_ID ),
+
DEF_VALS1(MQCACF_ACTIVITY_DESC ),
DEF_VALS1(MQCACF_ADMIN_TOPIC_NAMES ),
DEF_VALS1(MQCACF_ADMIN_TOPIC_NAMES ),
DEF_VALS1(MQCACF_ALIAS_Q_NAMES ),
+ DEF_VALS1(MQCACF_ALTERNATE_USERID ),
DEF_VALS1(MQCACF_APPL_DESC ),
+ DEF_VALS1(MQCACF_APPL_DESC ),
+ DEF_VALS1(MQCACF_APPL_FUNCTION ),
DEF_VALS1(MQCACF_APPL_IDENTITY_DATA ),
DEF_VALS1(MQCACF_APPL_NAME ),
DEF_VALS1(MQCACF_APPL_ORIGIN_DATA ),
@@ -2024,10 +2019,18 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCACF_BACKUP_DATE ),
DEF_VALS1(MQCACF_BACKUP_TIME ),
DEF_VALS1(MQCACF_BRIDGE_NAME ),
+ DEF_VALS1(MQCACF_CF_OFFLOAD_SIZE1 ),
+ DEF_VALS1(MQCACF_CF_OFFLOAD_SIZE2 ),
+ DEF_VALS1(MQCACF_CF_OFFLOAD_SIZE3 ),
+ DEF_VALS1(MQCACF_CF_SMDS ),
+ DEF_VALS1(MQCACF_CF_SMDSCONN ),
+ DEF_VALS1(MQCACF_CF_SMDS_GENERIC_NAME ),
DEF_VALS1(MQCACF_CF_STRUC_BACKUP_END ),
DEF_VALS1(MQCACF_CF_STRUC_BACKUP_START ),
DEF_VALS1(MQCACF_CF_STRUC_LOG_Q_MGRS ),
+ DEF_VALS1(MQCACF_CF_STRUC_NAME ),
DEF_VALS1(MQCACF_CF_STRUC_NAMES ),
+ DEF_VALS1(MQCACF_CHAR_ATTRS ),
DEF_VALS1(MQCACF_CHILD_Q_MGR_NAME ),
DEF_VALS1(MQCACF_COMMAND_MQSC ),
DEF_VALS1(MQCACF_COMMAND_SCOPE ),
@@ -2040,6 +2043,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCACF_DESTINATION ),
DEF_VALS1(MQCACF_DESTINATION_Q_MGR ),
DEF_VALS1(MQCACF_DSG_NAME ),
+ DEF_VALS1(MQCACF_DYNAMIC_Q_NAME ),
DEF_VALS1(MQCACF_ENTITY_NAME ),
DEF_VALS1(MQCACF_ENV_INFO ),
DEF_VALS1(MQCACF_ESCAPE_TEXT ),
@@ -2054,6 +2058,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCACF_FROM_AUTH_INFO_NAME ),
DEF_VALS1(MQCACF_FROM_CF_STRUC_NAME ),
DEF_VALS1(MQCACF_FROM_CHANNEL_NAME ),
+ DEF_VALS1(MQCACF_FROM_COMM_INFO_NAME ),
DEF_VALS1(MQCACF_FROM_LISTENER_NAME ),
DEF_VALS1(MQCACF_FROM_NAMELIST_NAME ),
DEF_VALS1(MQCACF_FROM_PROCESS_NAME ),
@@ -2063,6 +2068,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCACF_FROM_SUB_NAME ),
DEF_VALS1(MQCACF_FROM_TOPIC_NAME ),
DEF_VALS1(MQCACF_GROUP_ENTITY_NAMES ),
+ DEF_VALS1(MQCACF_HOST_NAME ),
DEF_VALS1(MQCACF_LAST_GET_DATE ),
DEF_VALS1(MQCACF_LAST_GET_TIME ),
DEF_VALS1(MQCACF_LAST_MSG_DATE ),
@@ -2075,10 +2081,12 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCACF_LOG_PATH ),
DEF_VALS1(MQCACF_MEDIA_LOG_EXTENT_NAME ),
DEF_VALS1(MQCACF_MODEL_Q_NAMES ),
+ DEF_VALS1(MQCACF_MQCB_NAME ),
DEF_VALS1(MQCACF_NAMELIST_NAMES ),
DEF_VALS1(MQCACF_NONE ),
DEF_VALS1(MQCACF_OBJECT_NAME ),
DEF_VALS1(MQCACF_OBJECT_Q_MGR_NAME ),
+ DEF_VALS1(MQCACF_OBJECT_STRING ),
DEF_VALS1(MQCACF_OPERATION_DATE ),
DEF_VALS1(MQCACF_OPERATION_TIME ),
DEF_VALS1(MQCACF_ORIGIN_NAME ),
@@ -2091,9 +2099,13 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCACF_PUT_DATE ),
DEF_VALS1(MQCACF_PUT_TIME ),
DEF_VALS1(MQCACF_Q_MGR_CPF ),
+ DEF_VALS1(MQCACF_Q_MGR_START_DATE ),
+ DEF_VALS1(MQCACF_Q_MGR_START_TIME ),
DEF_VALS1(MQCACF_Q_MGR_UOW_ID ),
DEF_VALS1(MQCACF_Q_NAMES ),
DEF_VALS1(MQCACF_RECEIVER_CHANNEL_NAMES ),
+ DEF_VALS1(MQCACF_RECOVERY_DATE ),
+ DEF_VALS1(MQCACF_RECOVERY_TIME ),
DEF_VALS1(MQCACF_REG_CORREL_ID ),
DEF_VALS1(MQCACF_REG_Q_MGR_NAME ),
DEF_VALS1(MQCACF_REG_Q_NAME ),
@@ -2108,11 +2120,17 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCACF_REPLY_TO_Q ),
DEF_VALS1(MQCACF_REPLY_TO_Q_MGR ),
DEF_VALS1(MQCACF_REQUESTER_CHANNEL_NAMES),
+ DEF_VALS1(MQCACF_RESOLVED_LOCAL_Q_MGR ),
+ DEF_VALS1(MQCACF_RESOLVED_LOCAL_Q_NAME ),
+ DEF_VALS1(MQCACF_RESOLVED_OBJECT_STRING ),
+ DEF_VALS1(MQCACF_RESOLVED_Q_MGR ),
DEF_VALS1(MQCACF_RESOLVED_Q_NAME ),
DEF_VALS1(MQCACF_RESPONSE_Q_MGR_NAME ),
DEF_VALS1(MQCACF_RESTART_LOG_EXTENT_NAME),
DEF_VALS1(MQCACF_ROUTING_FINGER_PRINT ),
+ DEF_VALS1(MQCACF_ROUTING_FINGER_PRINT ),
DEF_VALS1(MQCACF_SECURITY_PROFILE ),
+ DEF_VALS1(MQCACF_SELECTION_STRING ),
DEF_VALS1(MQCACF_SENDER_CHANNEL_NAMES ),
DEF_VALS1(MQCACF_SERVER_CHANNEL_NAMES ),
DEF_VALS1(MQCACF_SERVICE_COMPONENT ),
@@ -2155,6 +2173,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCACF_TO_AUTH_INFO_NAME ),
DEF_VALS1(MQCACF_TO_CF_STRUC_NAME ),
DEF_VALS1(MQCACF_TO_CHANNEL_NAME ),
+ DEF_VALS1(MQCACF_TO_COMM_INFO_NAME ),
DEF_VALS1(MQCACF_TO_LISTENER_NAME ),
DEF_VALS1(MQCACF_TO_NAMELIST_NAME ),
DEF_VALS1(MQCACF_TO_PROCESS_NAME ),
@@ -2173,33 +2192,6 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCACF_USAGE_LOG_RBA ),
DEF_VALS1(MQCACF_USER_IDENTIFIER ),
DEF_VALS1(MQCACF_VALUE_NAME ),
- DEF_VALS1(MQCACF_ALTERNATE_USERID ),
- DEF_VALS1(MQCACF_APPL_DESC ),
- DEF_VALS1(MQCACF_APPL_FUNCTION ),
- DEF_VALS1(MQCACF_CF_OFFLOAD_SIZE1 ),
- DEF_VALS1(MQCACF_CF_OFFLOAD_SIZE2 ),
- DEF_VALS1(MQCACF_CF_OFFLOAD_SIZE3 ),
- DEF_VALS1(MQCACF_CF_SMDS ),
- DEF_VALS1(MQCACF_CF_SMDSCONN ),
- DEF_VALS1(MQCACF_CF_SMDS_GENERIC_NAME ),
- DEF_VALS1(MQCACF_CF_STRUC_NAME ),
- DEF_VALS1(MQCACF_CHAR_ATTRS ),
- DEF_VALS1(MQCACF_DYNAMIC_Q_NAME ),
- DEF_VALS1(MQCACF_FROM_COMM_INFO_NAME ),
- DEF_VALS1(MQCACF_HOST_NAME ),
- DEF_VALS1(MQCACF_MQCB_NAME ),
- DEF_VALS1(MQCACF_OBJECT_STRING ),
- DEF_VALS1(MQCACF_Q_MGR_START_DATE ),
- DEF_VALS1(MQCACF_Q_MGR_START_TIME ),
- DEF_VALS1(MQCACF_RECOVERY_DATE ),
- DEF_VALS1(MQCACF_RECOVERY_TIME ),
- DEF_VALS1(MQCACF_RESOLVED_LOCAL_Q_MGR ),
- DEF_VALS1(MQCACF_RESOLVED_LOCAL_Q_NAME ),
- DEF_VALS1(MQCACF_RESOLVED_OBJECT_STRING ),
- DEF_VALS1(MQCACF_RESOLVED_Q_MGR ),
- DEF_VALS1(MQCACF_ROUTING_FINGER_PRINT ),
- DEF_VALS1(MQCACF_SELECTION_STRING ),
- DEF_VALS1(MQCACF_TO_COMM_INFO_NAME ),
DEF_VALS1(MQCACF_XA_INFO ),
DEF_VALS1(MQCACF_XQH_PUT_DATE ),
DEF_VALS1(MQCACF_XQH_PUT_TIME ),
@@ -2243,8 +2235,8 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCACH_RCV_EXIT_NAME ),
DEF_VALS1(MQCACH_RCV_EXIT_USER_DATA ),
DEF_VALS1(MQCACH_REMOTE_APPL_TAG ),
- DEF_VALS1(MQCACH_REMOTE_VERSION ),
DEF_VALS1(MQCACH_REMOTE_PRODUCT ),
+ DEF_VALS1(MQCACH_REMOTE_VERSION ),
DEF_VALS1(MQCACH_SEC_EXIT_NAME ),
DEF_VALS1(MQCACH_SEC_EXIT_USER_DATA ),
DEF_VALS1(MQCACH_SEND_EXIT_NAME ),
@@ -2254,9 +2246,9 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCACH_SSL_CIPHER_SPEC ),
DEF_VALS1(MQCACH_SSL_CIPHER_SUITE ),
DEF_VALS1(MQCACH_SSL_HANDSHAKE_STAGE ),
+ DEF_VALS1(MQCACH_SSL_KEY_PASSPHRASE ),
DEF_VALS1(MQCACH_SSL_KEY_RESET_DATE ),
DEF_VALS1(MQCACH_SSL_KEY_RESET_TIME ),
- DEF_VALS1(MQCACH_SSL_KEY_PASSPHRASE ),
DEF_VALS1(MQCACH_SSL_PEER_NAME ),
DEF_VALS1(MQCACH_SSL_SHORT_PEER_NAME ),
DEF_VALS1(MQCACH_TCP_NAME ),
@@ -2295,6 +2287,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCA_CHANNEL_AUTO_DEF_EXIT ),
DEF_VALS1(MQCA_CHILD ),
DEF_VALS1(MQCA_CHINIT_SERVICE_PARM ),
+ DEF_VALS1(MQCA_CHLAUTH_DESC ),
DEF_VALS1(MQCA_CICS_FILE_NAME ),
DEF_VALS1(MQCA_CLUSTER_DATE ),
DEF_VALS1(MQCA_CLUSTER_NAME ),
@@ -2303,16 +2296,23 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCA_CLUSTER_TIME ),
DEF_VALS1(MQCA_CLUSTER_WORKLOAD_DATA ),
DEF_VALS1(MQCA_CLUSTER_WORKLOAD_EXIT ),
+ DEF_VALS1(MQCA_CLUS_CHL_NAME ),
DEF_VALS1(MQCA_COMMAND_INPUT_Q_NAME ),
DEF_VALS1(MQCA_COMMAND_REPLY_Q_NAME ),
+ DEF_VALS1(MQCA_COMM_INFO_DESC ),
+ DEF_VALS1(MQCA_COMM_INFO_NAME ),
DEF_VALS1(MQCA_CREATION_DATE ),
DEF_VALS1(MQCA_CREATION_TIME ),
+ DEF_VALS1(MQCA_CUSTOM ),
DEF_VALS1(MQCA_DEAD_LETTER_Q_NAME ),
DEF_VALS1(MQCA_DEF_XMIT_Q_NAME ),
DEF_VALS1(MQCA_DNS_GROUP ),
DEF_VALS1(MQCA_ENV_DATA ),
DEF_VALS1(MQCA_IGQ_USER_ID ),
DEF_VALS1(MQCA_INITIATION_Q_NAME ),
+ DEF_VALS1(MQCA_INSTALLATION_DESC ),
+ DEF_VALS1(MQCA_INSTALLATION_NAME ),
+ DEF_VALS1(MQCA_INSTALLATION_PATH ),
DEF_VALS1(MQCA_LDAP_PASSWORD ),
DEF_VALS1(MQCA_LDAP_USER_NAME ),
DEF_VALS1(MQCA_LU62_ARM_SUFFIX ),
@@ -2326,6 +2326,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCA_NAMES ),
DEF_VALS1(MQCA_PARENT ),
DEF_VALS1(MQCA_PASS_TICKET_APPL ),
+ DEF_VALS1(MQCA_POLICY_NAME ),
DEF_VALS1(MQCA_PROCESS_DESC ),
DEF_VALS1(MQCA_PROCESS_NAME ),
DEF_VALS1(MQCA_QSG_NAME ),
@@ -2334,6 +2335,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCA_Q_MGR_IDENTIFIER ),
DEF_VALS1(MQCA_Q_MGR_NAME ),
DEF_VALS1(MQCA_Q_NAME ),
+ DEF_VALS1(MQCA_RECIPIENT_DN ),
DEF_VALS1(MQCA_REMOTE_Q_MGR_NAME ),
DEF_VALS1(MQCA_REMOTE_Q_NAME ),
DEF_VALS1(MQCA_REPOSITORY_NAME ),
@@ -2346,6 +2348,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCA_SERVICE_START_COMMAND ),
DEF_VALS1(MQCA_SERVICE_STOP_ARGS ),
DEF_VALS1(MQCA_SERVICE_STOP_COMMAND ),
+ DEF_VALS1(MQCA_SIGNER_DN ),
DEF_VALS1(MQCA_SSL_CRL_NAMELIST ),
DEF_VALS1(MQCA_SSL_CRYPTO_HARDWARE ),
DEF_VALS1(MQCA_SSL_KEY_LIBRARY ),
@@ -2371,25 +2374,14 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQCA_USER_LIST ),
DEF_VALS1(MQCA_XCF_GROUP_NAME ),
DEF_VALS1(MQCA_XCF_MEMBER_NAME ),
- DEF_VALS1(MQCA_XR_VERSION2 ),
DEF_VALS1(MQCA_XMIT_Q_NAME ),
- DEF_VALS1(MQCA_CHLAUTH_DESC ),
- DEF_VALS1(MQCA_CLUS_CHL_NAME ),
- DEF_VALS1(MQCA_COMM_INFO_NAME ),
- DEF_VALS1(MQCA_COMM_INFO_DESC ),
- DEF_VALS1(MQCA_CUSTOM ),
- DEF_VALS1(MQCA_INSTALLATION_DESC ),
- DEF_VALS1(MQCA_INSTALLATION_NAME ),
- DEF_VALS1(MQCA_INSTALLATION_PATH ),
- DEF_VALS1(MQCA_POLICY_NAME ),
- DEF_VALS1(MQCA_RECIPIENT_DN ),
- DEF_VALS1(MQCA_SIGNER_DN ),
- DEF_VALS1(MQCA_XR_VERSION ),
DEF_VALS1(MQCA_XR_SSL_CIPHER_SUITES ),
+ DEF_VALS1(MQCA_XR_VERSION ),
+ DEF_VALS1(MQCA_XR_VERSION2 ),
DEF_VALS1(MQGACF_ACTIVITY ),
- DEF_VALS1(MQGACF_APP_DIST_LIST ),
DEF_VALS1(MQGACF_ACTIVITY_TRACE ),
+ DEF_VALS1(MQGACF_APP_DIST_LIST ),
DEF_VALS1(MQGACF_CHL_STATISTICS_DATA ),
DEF_VALS1(MQGACF_COMMAND_CONTEXT ),
DEF_VALS1(MQGACF_COMMAND_DATA ),
@@ -2405,7 +2397,10 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACF_ACTION ),
DEF_VALS1(MQIACF_ALL ),
DEF_VALS1(MQIACF_ANONYMOUS_COUNT ),
+ DEF_VALS1(MQIACF_API_CALLER_TYPE ),
+ DEF_VALS1(MQIACF_API_ENVIRONMENT ),
DEF_VALS1(MQIACF_APPL_COUNT ),
+ DEF_VALS1(MQIACF_APPL_FUNCTION_TYPE ),
DEF_VALS1(MQIACF_ASYNC_STATE ),
DEF_VALS1(MQIACF_AUTHORIZATION_LIST ),
DEF_VALS1(MQIACF_AUTH_ADD_AUTHS ),
@@ -2420,11 +2415,17 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACF_BRIDGE_TYPE ),
DEF_VALS1(MQIACF_BROKER_COUNT ),
DEF_VALS1(MQIACF_BROKER_OPTIONS ),
+ DEF_VALS1(MQIACF_BUFFER_LENGTH ),
DEF_VALS1(MQIACF_BUFFER_POOL_ID ),
+ DEF_VALS1(MQIACF_CALL_TYPE ),
+ DEF_VALS1(MQIACF_CF_SMDS_BLOCK_SIZE ),
+ DEF_VALS1(MQIACF_CF_SMDS_EXPAND ),
DEF_VALS1(MQIACF_CF_STATUS_BACKUP ),
DEF_VALS1(MQIACF_CF_STATUS_CONNECT ),
+ DEF_VALS1(MQIACF_CF_STATUS_SMDS ),
DEF_VALS1(MQIACF_CF_STATUS_SUMMARY ),
DEF_VALS1(MQIACF_CF_STATUS_TYPE ),
+ DEF_VALS1(MQIACF_CF_STRUC_ACCESS ),
DEF_VALS1(MQIACF_CF_STRUC_ATTRS ),
DEF_VALS1(MQIACF_CF_STRUC_BACKUP_SIZE ),
DEF_VALS1(MQIACF_CF_STRUC_ENTRIES_MAX ),
@@ -2435,9 +2436,11 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACF_CF_STRUC_TYPE ),
DEF_VALS1(MQIACF_CHANNEL_ATTRS ),
DEF_VALS1(MQIACF_CHINIT_STATUS ),
+ DEF_VALS1(MQIACF_CHLAUTH_ATTRS ),
DEF_VALS1(MQIACF_CHLAUTH_TYPE ),
DEF_VALS1(MQIACF_CLEAR_SCOPE ),
DEF_VALS1(MQIACF_CLEAR_TYPE ),
+ DEF_VALS1(MQIACF_CLOSE_OPTIONS ),
DEF_VALS1(MQIACF_CLUSTER_INFO ),
DEF_VALS1(MQIACF_CLUSTER_Q_MGR_ATTRS ),
DEF_VALS1(MQIACF_CMDSCOPE_Q_MGR_COUNT ),
@@ -2450,14 +2453,17 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACF_CONNECTION_ATTRS ),
DEF_VALS1(MQIACF_CONNECTION_COUNT ),
DEF_VALS1(MQIACF_CONNECT_OPTIONS ),
+ DEF_VALS1(MQIACF_CONNECT_TIME ),
DEF_VALS1(MQIACF_CONN_INFO_ALL ),
DEF_VALS1(MQIACF_CONN_INFO_CONN ),
DEF_VALS1(MQIACF_CONN_INFO_HANDLE ),
DEF_VALS1(MQIACF_CONN_INFO_TYPE ),
DEF_VALS1(MQIACF_CONV_REASON_CODE ),
+ DEF_VALS1(MQIACF_CTL_OPERATION ),
DEF_VALS1(MQIACF_DB2_CONN_STATUS ),
DEF_VALS1(MQIACF_DELETE_OPTIONS ),
DEF_VALS1(MQIACF_DESTINATION_CLASS ),
+ DEF_VALS1(MQIACF_DISCONNECT_TIME ),
DEF_VALS1(MQIACF_DISCONTINUITY_COUNT ),
DEF_VALS1(MQIACF_DURABLE_SUBSCRIPTION ),
DEF_VALS1(MQIACF_ENCODING ),
@@ -2470,29 +2476,46 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACF_EXCLUDE_INTERVAL ),
DEF_VALS1(MQIACF_EXPIRY ),
DEF_VALS1(MQIACF_EXPIRY_Q_COUNT ),
+ DEF_VALS1(MQIACF_EXPIRY_TIME ),
+ DEF_VALS1(MQIACF_EXPORT_ATTRS ),
+ DEF_VALS1(MQIACF_EXPORT_TYPE ),
DEF_VALS1(MQIACF_FEEDBACK ),
DEF_VALS1(MQIACF_FORCE ),
+ DEF_VALS1(MQIACF_GET_OPTIONS ),
DEF_VALS1(MQIACF_GROUPUR_CHECK_ID ),
DEF_VALS1(MQIACF_HANDLE_STATE ),
+ DEF_VALS1(MQIACF_HOBJ ),
+ DEF_VALS1(MQIACF_HSUB ),
DEF_VALS1(MQIACF_INQUIRY ),
+ DEF_VALS1(MQIACF_INTATTR_COUNT ),
DEF_VALS1(MQIACF_INTEGER_DATA ),
DEF_VALS1(MQIACF_INTERFACE_VERSION ),
+ DEF_VALS1(MQIACF_INT_ATTRS ),
+ DEF_VALS1(MQIACF_INVALID_DEST_COUNT ),
+ DEF_VALS1(MQIACF_ITEM_COUNT ),
+ DEF_VALS1(MQIACF_KNOWN_DEST_COUNT ),
DEF_VALS1(MQIACF_LISTENER_ATTRS ),
DEF_VALS1(MQIACF_LISTENER_STATUS_ATTRS ),
DEF_VALS1(MQIACF_LOG_COMPRESSION ),
DEF_VALS1(MQIACF_MAX_ACTIVITIES ),
+ DEF_VALS1(MQIACF_MCAST_REL_INDICATOR ),
DEF_VALS1(MQIACF_MESSAGE_COUNT ),
- DEF_VALS2(MQIACF_MODE,"MQIACF_QUIESCE"),
+ DEF_VALS2(MQIACF_MODE, "MQIACF_QUIESCE"),
DEF_VALS1(MQIACF_MONITORING ),
DEF_VALS1(MQIACF_MOVE_COUNT ),
DEF_VALS1(MQIACF_MOVE_TYPE ),
DEF_VALS1(MQIACF_MOVE_TYPE_ADD ),
DEF_VALS1(MQIACF_MOVE_TYPE_MOVE ),
+ DEF_VALS1(MQIACF_MQCB_OPERATION ),
+ DEF_VALS1(MQIACF_MQCB_OPTIONS ),
+ DEF_VALS1(MQIACF_MQCB_TYPE ),
+ DEF_VALS1(MQIACF_MQXR_DIAGNOSTICS_TYPE ),
DEF_VALS1(MQIACF_MSG_FLAGS ),
DEF_VALS1(MQIACF_MSG_LENGTH ),
DEF_VALS1(MQIACF_MSG_TYPE ),
DEF_VALS1(MQIACF_MULC_CAPTURE ),
DEF_VALS1(MQIACF_NAMELIST_ATTRS ),
+ DEF_VALS1(MQIACF_NUM_PUBS ),
DEF_VALS1(MQIACF_OBJECT_TYPE ),
DEF_VALS1(MQIACF_OBSOLETE_MSGS ),
DEF_VALS1(MQIACF_OFFSET ),
@@ -2504,6 +2527,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACF_OPEN_OUTPUT ),
DEF_VALS1(MQIACF_OPEN_SET ),
DEF_VALS1(MQIACF_OPEN_TYPE ),
+ DEF_VALS1(MQIACF_OPERATION_ID ),
DEF_VALS1(MQIACF_OPERATION_MODE ),
DEF_VALS1(MQIACF_OPERATION_TYPE ),
DEF_VALS1(MQIACF_OPTIONS ),
@@ -2512,6 +2536,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACF_PARAMETER_ID ),
DEF_VALS1(MQIACF_PERMIT_STANDBY ),
DEF_VALS1(MQIACF_PERSISTENCE ),
+ DEF_VALS1(MQIACF_POINTER_SIZE ),
DEF_VALS1(MQIACF_PRIORITY ),
DEF_VALS1(MQIACF_PROCESS_ATTRS ),
DEF_VALS1(MQIACF_PROCESS_ID ),
@@ -2523,6 +2548,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACF_PUBSUB_STATUS_ATTRS ),
DEF_VALS1(MQIACF_PUB_PRIORITY ),
DEF_VALS1(MQIACF_PURGE ),
+ DEF_VALS1(MQIACF_PUT_OPTIONS ),
DEF_VALS1(MQIACF_QSG_DISPS ),
DEF_VALS1(MQIACF_Q_ATTRS ),
DEF_VALS1(MQIACF_Q_HANDLE ),
@@ -2547,15 +2573,18 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACF_REASON_CODE ),
DEF_VALS1(MQIACF_REASON_QUALIFIER ),
DEF_VALS1(MQIACF_RECORDED_ACTIVITIES ),
+ DEF_VALS1(MQIACF_RECS_PRESENT ),
DEF_VALS1(MQIACF_REFRESH_INTERVAL ),
DEF_VALS1(MQIACF_REFRESH_REPOSITORY ),
DEF_VALS1(MQIACF_REFRESH_TYPE ),
DEF_VALS1(MQIACF_REGISTRATION_OPTIONS ),
DEF_VALS1(MQIACF_REG_REG_OPTIONS ),
+ DEF_VALS1(MQIACF_REMOVE_AUTHREC ),
DEF_VALS1(MQIACF_REMOVE_QUEUES ),
DEF_VALS1(MQIACF_REPLACE ),
DEF_VALS1(MQIACF_REPORT ),
DEF_VALS1(MQIACF_REQUEST_ONLY ),
+ DEF_VALS1(MQIACF_RESOLVED_TYPE ),
DEF_VALS1(MQIACF_RETAINED_PUBLICATION ),
DEF_VALS1(MQIACF_ROUTE_ACCUMULATION ),
DEF_VALS1(MQIACF_ROUTE_DELIVERY ),
@@ -2569,12 +2598,23 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACF_SECURITY_TIMEOUT ),
DEF_VALS1(MQIACF_SECURITY_TYPE ),
DEF_VALS1(MQIACF_SELECTOR ),
+ DEF_VALS1(MQIACF_SELECTORS ),
+ DEF_VALS1(MQIACF_SELECTOR_COUNT ),
DEF_VALS1(MQIACF_SELECTOR_TYPE ),
DEF_VALS1(MQIACF_SEQUENCE_NUMBER ),
DEF_VALS1(MQIACF_SERVICE_ATTRS ),
DEF_VALS1(MQIACF_SERVICE_STATUS ),
DEF_VALS1(MQIACF_SERVICE_STATUS_ATTRS ),
+ DEF_VALS1(MQIACF_SMDS_AVAIL ),
+ DEF_VALS1(MQIACF_SMDS_EXPANDST ),
+ DEF_VALS1(MQIACF_SMDS_EXPANDST ),
+ DEF_VALS1(MQIACF_SMDS_OPENMODE ),
+ DEF_VALS1(MQIACF_SMDS_STATUS ),
+ DEF_VALS1(MQIACF_STATUS_TYPE ),
DEF_VALS1(MQIACF_STORAGE_CLASS_ATTRS ),
+ DEF_VALS1(MQIACF_STRUC_LENGTH ),
+ DEF_VALS1(MQIACF_SUBRQ_ACTION ),
+ DEF_VALS1(MQIACF_SUBRQ_OPTIONS ),
DEF_VALS1(MQIACF_SUBSCRIPTION_SCOPE ),
DEF_VALS1(MQIACF_SUB_ATTRS ),
DEF_VALS1(MQIACF_SUB_LEVEL ),
@@ -2633,6 +2673,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACF_SYSP_UNIT_STATUS ),
DEF_VALS1(MQIACF_SYSP_WLM_INTERVAL ),
DEF_VALS1(MQIACF_SYSP_WLM_INT_UNITS ),
+ DEF_VALS1(MQIACF_SYSTEM_OBJECTS ),
DEF_VALS1(MQIACF_THREAD_ID ),
DEF_VALS1(MQIACF_TOPIC_ATTRS ),
DEF_VALS1(MQIACF_TOPIC_PUB ),
@@ -2640,29 +2681,51 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACF_TOPIC_STATUS_ATTRS ),
DEF_VALS1(MQIACF_TOPIC_STATUS_TYPE ),
DEF_VALS1(MQIACF_TOPIC_SUB ),
+ DEF_VALS1(MQIACF_TRACE_DATA_LENGTH ),
+ DEF_VALS1(MQIACF_TRACE_DETAIL ),
DEF_VALS1(MQIACF_UNCOMMITTED_MSGS ),
+ DEF_VALS1(MQIACF_UNKNOWN_DEST_COUNT ),
DEF_VALS1(MQIACF_UNRECORDED_ACTIVITIES ),
DEF_VALS1(MQIACF_UOW_STATE ),
DEF_VALS1(MQIACF_UOW_TYPE ),
+ DEF_VALS1(MQIACF_USAGE_BLOCK_SIZE ),
DEF_VALS1(MQIACF_USAGE_BUFFER_POOL ),
+ DEF_VALS1(MQIACF_USAGE_DATA_BLOCKS ),
DEF_VALS1(MQIACF_USAGE_DATA_SET ),
DEF_VALS1(MQIACF_USAGE_DATA_SET_TYPE ),
+ DEF_VALS1(MQIACF_USAGE_EMPTY_BUFFERS ),
DEF_VALS1(MQIACF_USAGE_EXPAND_COUNT ),
DEF_VALS1(MQIACF_USAGE_EXPAND_TYPE ),
+ DEF_VALS1(MQIACF_USAGE_INUSE_BUFFERS ),
+ DEF_VALS1(MQIACF_USAGE_LOWEST_FREE ),
DEF_VALS1(MQIACF_USAGE_NONPERSIST_PAGES ),
+ DEF_VALS1(MQIACF_USAGE_OFFLOAD_MSGS ),
DEF_VALS1(MQIACF_USAGE_PAGESET ),
DEF_VALS1(MQIACF_USAGE_PERSIST_PAGES ),
+ DEF_VALS1(MQIACF_USAGE_READS_SAVED ),
DEF_VALS1(MQIACF_USAGE_RESTART_EXTENTS ),
+ DEF_VALS1(MQIACF_USAGE_SAVED_BUFFERS ),
+ DEF_VALS1(MQIACF_USAGE_SMDS ),
+ DEF_VALS1(MQIACF_USAGE_TOTAL_BLOCKS ),
DEF_VALS1(MQIACF_USAGE_TOTAL_BUFFERS ),
DEF_VALS1(MQIACF_USAGE_TOTAL_PAGES ),
DEF_VALS1(MQIACF_USAGE_TYPE ),
DEF_VALS1(MQIACF_USAGE_UNUSED_PAGES ),
+ DEF_VALS1(MQIACF_USAGE_USED_BLOCKS ),
+ DEF_VALS1(MQIACF_USAGE_USED_RATE ),
+ DEF_VALS1(MQIACF_USAGE_WAIT_RATE ),
DEF_VALS1(MQIACF_USER_ID_SUPPORT ),
DEF_VALS1(MQIACF_VARIABLE_USER_ID ),
DEF_VALS1(MQIACF_VERSION ),
DEF_VALS1(MQIACF_WAIT_INTERVAL ),
DEF_VALS1(MQIACF_WILDCARD_SCHEMA ),
- DEF_VALS1(MQIACF_MCAST_REL_INDICATOR ),
+ DEF_VALS1(MQIACF_XA_COUNT ),
+ DEF_VALS1(MQIACF_XA_FLAGS ),
+ DEF_VALS1(MQIACF_XA_HANDLE ),
+ DEF_VALS1(MQIACF_XA_RETCODE ),
+ DEF_VALS1(MQIACF_XA_RETVAL ),
+ DEF_VALS1(MQIACF_XA_RMID ),
+ DEF_VALS1(MQIACF_XR_ATTRS ),
DEF_VALS1(MQIACH_ACTIVE_CHL ),
DEF_VALS1(MQIACH_ACTIVE_CHL_MAX ),
@@ -2676,13 +2739,19 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACH_ALLOC_FAST_TIMER ),
DEF_VALS1(MQIACH_ALLOC_RETRY ),
DEF_VALS1(MQIACH_ALLOC_SLOW_TIMER ),
+ DEF_VALS1(MQIACH_AVAILABLE_CIPHERSPECS ),
+ DEF_VALS1(MQIACH_AVAILABLE_CIPHERSPECS ),
DEF_VALS1(MQIACH_BACKLOG ),
DEF_VALS1(MQIACH_BATCHES ),
+ DEF_VALS1(MQIACH_BATCH_DATA_LIMIT ),
+ DEF_VALS1(MQIACH_BATCH_DATA_LIMIT ),
DEF_VALS1(MQIACH_BATCH_HB ),
DEF_VALS1(MQIACH_BATCH_INTERVAL ),
DEF_VALS1(MQIACH_BATCH_SIZE ),
DEF_VALS1(MQIACH_BATCH_SIZE_INDICATOR ),
+ DEF_VALS2(MQIACH_BUFFERS_RECEIVED,"MQIACH_BUFFERS_RCVD"),
DEF_VALS1(MQIACH_BUFFERS_SENT ),
+ DEF_VALS2(MQIACH_BYTES_RECEIVED,"MQIACH_BYTES_RCVD"),
DEF_VALS1(MQIACH_BYTES_SENT ),
DEF_VALS1(MQIACH_CHANNEL_DISP ),
DEF_VALS1(MQIACH_CHANNEL_ERROR_DATA ),
@@ -2690,6 +2759,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACH_CHANNEL_INSTANCE_TYPE ),
DEF_VALS1(MQIACH_CHANNEL_STATUS ),
DEF_VALS1(MQIACH_CHANNEL_SUBSTATE ),
+ DEF_VALS1(MQIACH_CHANNEL_SUMMARY_ATTRS ),
DEF_VALS1(MQIACH_CHANNEL_TABLE ),
DEF_VALS1(MQIACH_CHANNEL_TYPE ),
DEF_VALS1(MQIACH_CHANNEL_TYPES ),
@@ -2706,10 +2776,13 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACH_CURRENT_CHL_MAX ),
DEF_VALS1(MQIACH_CURRENT_CHL_TCP ),
DEF_VALS1(MQIACH_CURRENT_MSGS ),
+ DEF_VALS2(MQIACH_CURRENT_SEQUENCE_NUMBER,"MQIACH_CURRENT_SEQ_NUMBER"),
DEF_VALS1(MQIACH_CURRENT_SHARING_CONVS ),
DEF_VALS1(MQIACH_DATA_CONVERSION ),
DEF_VALS1(MQIACH_DATA_COUNT ),
DEF_VALS1(MQIACH_DEF_CHANNEL_DISP ),
+ DEF_VALS1(MQIACH_DEF_RECONNECT ),
+ DEF_VALS1(MQIACH_DEF_RECONNECT ),
DEF_VALS1(MQIACH_DISC_INTERVAL ),
DEF_VALS1(MQIACH_DISC_RETRY ),
DEF_VALS1(MQIACH_DISPS_MAX ),
@@ -2720,12 +2793,17 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACH_INBOUND_DISP ),
DEF_VALS1(MQIACH_INDOUBT_STATUS ),
DEF_VALS1(MQIACH_IN_DOUBT ),
+ DEF_VALS1(MQIACH_IN_DOUBT_IN ),
+ DEF_VALS1(MQIACH_IN_DOUBT_OUT ),
DEF_VALS1(MQIACH_KEEP_ALIVE_INTERVAL ),
+ DEF_VALS2(MQIACH_LAST_SEQUENCE_NUMBER, "MQIACH_LAST_SEQ_NUMBER"),
DEF_VALS1(MQIACH_LISTENER_CONTROL ),
DEF_VALS1(MQIACH_LISTENER_STATUS ),
DEF_VALS1(MQIACH_LONG_RETRIES_LEFT ),
DEF_VALS1(MQIACH_LONG_RETRY ),
DEF_VALS1(MQIACH_LONG_TIMER ),
+ DEF_VALS1(MQIACH_MATCH ),
+ DEF_VALS1(MQIACH_MATCH ),
DEF_VALS1(MQIACH_MAX_INSTANCES ),
DEF_VALS1(MQIACH_MAX_INSTS_PER_CLIENT ),
DEF_VALS1(MQIACH_MAX_MSG_LENGTH ),
@@ -2733,18 +2811,32 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACH_MAX_XMIT_SIZE ),
DEF_VALS1(MQIACH_MCA_STATUS ),
DEF_VALS1(MQIACH_MCA_TYPE ),
+ DEF_VALS1(MQIACH_MC_HB_INTERVAL ),
+ DEF_VALS1(MQIACH_MQTT_KEEP_ALIVE ),
DEF_VALS1(MQIACH_MR_COUNT ),
DEF_VALS1(MQIACH_MR_INTERVAL ),
DEF_VALS1(MQIACH_MSGS ),
+ DEF_VALS1(MQIACH_MSGS_RCVD ),
+ DEF_VALS1(MQIACH_MSGS_RECEIVED ),
+ DEF_VALS2(MQIACH_MSGS_RECEIVED,"MQIACH_MSGS_RCVD"),
+ DEF_VALS1(MQIACH_MSGS_SENT ),
+ DEF_VALS1(MQIACH_MSGS_SENT ),
DEF_VALS1(MQIACH_MSG_COMPRESSION ),
+ DEF_VALS1(MQIACH_MSG_HISTORY ),
DEF_VALS1(MQIACH_MSG_SEQUENCE_NUMBER ),
+ DEF_VALS1(MQIACH_MULTICAST_PROPERTIES ),
DEF_VALS1(MQIACH_NAME_COUNT ),
DEF_VALS1(MQIACH_NETWORK_PRIORITY ),
DEF_VALS1(MQIACH_NETWORK_TIME_INDICATOR ),
+ DEF_VALS1(MQIACH_NEW_SUBSCRIBER_HISTORY ),
DEF_VALS1(MQIACH_NPM_SPEED ),
+ DEF_VALS1(MQIACH_PENDING_OUT ),
+ DEF_VALS1(MQIACH_PENDING_OUT ),
DEF_VALS1(MQIACH_PORT ),
DEF_VALS1(MQIACH_PORT_NUMBER ),
DEF_VALS1(MQIACH_PUT_AUTHORITY ),
+ DEF_VALS1(MQIACH_RESET_REQUESTED ),
+ DEF_VALS1(MQIACH_RESET_REQUESTED ),
DEF_VALS1(MQIACH_SEQUENCE_NUMBER_WRAP ),
DEF_VALS1(MQIACH_SESSION_COUNT ),
DEF_VALS1(MQIACH_SHARED_CHL_RESTART ),
@@ -2759,52 +2851,38 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIACH_SSL_KEY_RESETS ),
DEF_VALS1(MQIACH_SSL_RETURN_CODE ),
DEF_VALS1(MQIACH_STOP_REQUESTED ),
- DEF_VALS1(MQIACH_XMITQ_MSGS_AVAILABLE ),
- DEF_VALS1(MQIACH_XMITQ_TIME_INDICATOR ),
- DEF_VALS1(MQIACH_XMIT_PROTOCOL_TYPE ),
- DEF_VALS2(MQIACH_BUFFERS_RECEIVED,"MQIACH_BUFFERS_RCVD"),
- DEF_VALS2(MQIACH_BYTES_RECEIVED,"MQIACH_BYTES_RCVD"),
- DEF_VALS2(MQIACH_CURRENT_SEQUENCE_NUMBER,"MQIACH_CURRENT_SEQ_NUMBER"),
- DEF_VALS2(MQIACH_LAST_SEQUENCE_NUMBER, "MQIACH_LAST_SEQ_NUMBER"),
- DEF_VALS1(MQIACH_AVAILABLE_CIPHERSPECS ),
- DEF_VALS1(MQIACH_BATCH_DATA_LIMIT ),
- DEF_VALS1(MQIACH_CHANNEL_SUMMARY_ATTRS ),
- DEF_VALS1(MQIACH_DEF_RECONNECT ),
- DEF_VALS1(MQIACH_IN_DOUBT_IN ),
- DEF_VALS1(MQIACH_IN_DOUBT_OUT ),
- DEF_VALS1(MQIACH_MATCH ),
- DEF_VALS1(MQIACH_MC_HB_INTERVAL ),
- DEF_VALS1(MQIACH_MQTT_KEEP_ALIVE ),
- DEF_VALS1(MQIACH_MSGS_RCVD ),
- DEF_VALS1(MQIACH_MSGS_RECEIVED ),
- DEF_VALS1(MQIACH_MSGS_SENT ),
- DEF_VALS1(MQIACH_MSG_HISTORY ),
- DEF_VALS1(MQIACH_MULTICAST_PROPERTIES ),
- DEF_VALS1(MQIACH_NEW_SUBSCRIBER_HISTORY ),
- DEF_VALS1(MQIACH_PENDING_OUT ),
- DEF_VALS1(MQIACH_RESET_REQUESTED ),
+ DEF_VALS1(MQIACH_USER_SOURCE ),
DEF_VALS1(MQIACH_USER_SOURCE ),
DEF_VALS1(MQIACH_USE_CLIENT_ID ),
DEF_VALS1(MQIACH_WARNING ),
+ DEF_VALS1(MQIACH_WARNING ),
+ DEF_VALS1(MQIACH_XMITQ_MSGS_AVAILABLE ),
+ DEF_VALS1(MQIACH_XMITQ_TIME_INDICATOR ),
+ DEF_VALS1(MQIACH_XMIT_PROTOCOL_TYPE ),
+ DEF_VALS1(MQIAMO64_AVG_Q_TIME ),
DEF_VALS1(MQIAMO64_BROWSE_BYTES ),
DEF_VALS1(MQIAMO64_BYTES ),
DEF_VALS1(MQIAMO64_GET_BYTES ),
+ DEF_VALS1(MQIAMO64_HIGHRES_TIME ),
DEF_VALS1(MQIAMO64_PUBLISH_MSG_BYTES ),
DEF_VALS1(MQIAMO64_PUT_BYTES ),
- DEF_VALS1(MQIAMO64_TOPIC_PUT_BYTES ),
- DEF_VALS1(MQIAMO64_AVG_Q_TIME ),
DEF_VALS1(MQIAMO64_Q_TIME_AVG ),
DEF_VALS1(MQIAMO64_Q_TIME_MAX ),
DEF_VALS1(MQIAMO64_Q_TIME_MIN ),
- DEF_VALS1(MQIAMO64_HIGHRES_TIME ),
+ DEF_VALS1(MQIAMO64_TOPIC_PUT_BYTES ),
+ DEF_VALS1(MQIAMO_ACKS_RCVD ),
+ DEF_VALS1(MQIAMO_ACK_FEEDBACK ),
+ DEF_VALS1(MQIAMO_ACTIVE_ACKERS ),
DEF_VALS1(MQIAMO_AVG_BATCH_SIZE ),
+ DEF_VALS2(MQIAMO_AVG_Q_TIME,"MQIAMO64_AVG_Q_TIME"),
DEF_VALS1(MQIAMO_BACKOUTS ),
DEF_VALS1(MQIAMO_BROWSES ),
DEF_VALS1(MQIAMO_BROWSES_FAILED ),
DEF_VALS1(MQIAMO_BROWSE_MAX_BYTES ),
DEF_VALS1(MQIAMO_BROWSE_MIN_BYTES ),
+ DEF_VALS1(MQIAMO_BYTES_SENT ),
DEF_VALS1(MQIAMO_CBS ),
DEF_VALS1(MQIAMO_CBS_FAILED ),
DEF_VALS1(MQIAMO_CLOSES ),
@@ -2816,31 +2894,59 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIAMO_CONNS_MAX ),
DEF_VALS1(MQIAMO_CTLS ),
DEF_VALS1(MQIAMO_CTLS_FAILED ),
+ DEF_VALS1(MQIAMO_DEST_DATA_PORT ),
+ DEF_VALS1(MQIAMO_DEST_REPAIR_PORT ),
DEF_VALS1(MQIAMO_DISCS ),
DEF_VALS1(MQIAMO_DISCS_IMPLICIT ),
DEF_VALS1(MQIAMO_DISC_TYPE ),
DEF_VALS1(MQIAMO_EXIT_TIME_AVG ),
DEF_VALS1(MQIAMO_EXIT_TIME_MAX ),
DEF_VALS1(MQIAMO_EXIT_TIME_MIN ),
+ DEF_VALS1(MQIAMO_FEEDBACK_MODE ),
DEF_VALS1(MQIAMO_FULL_BATCHES ),
DEF_VALS1(MQIAMO_GENERATED_MSGS ),
DEF_VALS1(MQIAMO_GETS ),
DEF_VALS1(MQIAMO_GETS_FAILED ),
DEF_VALS1(MQIAMO_GET_MAX_BYTES ),
DEF_VALS1(MQIAMO_GET_MIN_BYTES ),
+ DEF_VALS1(MQIAMO_HISTORY_PKTS ),
DEF_VALS1(MQIAMO_INCOMPLETE_BATCHES ),
DEF_VALS1(MQIAMO_INQS ),
DEF_VALS1(MQIAMO_INQS_FAILED ),
+ DEF_VALS1(MQIAMO_INTERVAL ),
+ DEF_VALS1(MQIAMO_LAST_USED ),
+ DEF_VALS1(MQIAMO_LATE_JOIN_MARK ),
+ DEF_VALS1(MQIAMO_MCAST_BATCH_TIME ),
+ DEF_VALS1(MQIAMO_MCAST_HEARTBEAT ),
+ DEF_VALS1(MQIAMO_MCAST_XMIT_RATE ),
DEF_VALS1(MQIAMO_MSGS ),
+ DEF_VALS1(MQIAMO_MSGS_DELIVERED ),
DEF_VALS1(MQIAMO_MSGS_EXPIRED ),
DEF_VALS1(MQIAMO_MSGS_NOT_QUEUED ),
DEF_VALS1(MQIAMO_MSGS_PURGED ),
+ DEF_VALS1(MQIAMO_MSGS_RCVD ),
+ DEF_VALS1(MQIAMO_MSGS_SENT ),
+ DEF_VALS1(MQIAMO_MSG_BYTES_RCVD ),
+ DEF_VALS1(MQIAMO_NACKS_CREATED ),
+ DEF_VALS1(MQIAMO_NACKS_RCVD ),
+ DEF_VALS1(MQIAMO_NACK_FEEDBACK ),
+ DEF_VALS1(MQIAMO_NACK_PKTS_SENT ),
DEF_VALS1(MQIAMO_NET_TIME_AVG ),
DEF_VALS1(MQIAMO_NET_TIME_MAX ),
DEF_VALS1(MQIAMO_NET_TIME_MIN ),
+ DEF_VALS1(MQIAMO_NUM_STREAMS ),
DEF_VALS1(MQIAMO_OBJECT_COUNT ),
DEF_VALS1(MQIAMO_OPENS ),
DEF_VALS1(MQIAMO_OPENS_FAILED ),
+ DEF_VALS1(MQIAMO_PENDING_PKTS ),
+ DEF_VALS1(MQIAMO_PKTS_DELIVERED ),
+ DEF_VALS1(MQIAMO_PKTS_DROPPED ),
+ DEF_VALS1(MQIAMO_PKTS_DUPLICATED ),
+ DEF_VALS1(MQIAMO_PKTS_LOST ),
+ DEF_VALS1(MQIAMO_PKTS_PROCESSED ),
+ DEF_VALS1(MQIAMO_PKTS_REPAIRED ),
+ DEF_VALS1(MQIAMO_PKTS_SENT ),
+ DEF_VALS1(MQIAMO_PKT_RATE ),
DEF_VALS1(MQIAMO_PUBLISH_MSG_COUNT ),
DEF_VALS1(MQIAMO_PUT1S ),
DEF_VALS1(MQIAMO_PUT1S_FAILED ),
@@ -2851,6 +2957,14 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIAMO_PUT_RETRIES ),
DEF_VALS1(MQIAMO_Q_MAX_DEPTH ),
DEF_VALS1(MQIAMO_Q_MIN_DEPTH ),
+ DEF_VALS2(MQIAMO_Q_TIME_AVG,"MQIAMO64_Q_TIME_AVG"),
+ DEF_VALS2(MQIAMO_Q_TIME_MAX,"MQIAMO64_Q_TIME_MAX"),
+ DEF_VALS2(MQIAMO_Q_TIME_MIN,"MQIAMO64_Q_TIME_MIN"),
+ DEF_VALS1(MQIAMO_RELIABILITY_TYPE ),
+ DEF_VALS1(MQIAMO_REPAIR_BYTES ),
+ DEF_VALS1(MQIAMO_REPAIR_PKTS ),
+ DEF_VALS1(MQIAMO_REPAIR_PKTS_RCVD ),
+ DEF_VALS1(MQIAMO_REPAIR_PKTS_RQSTD ),
DEF_VALS1(MQIAMO_SETS ),
DEF_VALS1(MQIAMO_SETS_FAILED ),
DEF_VALS1(MQIAMO_STATS ),
@@ -2868,50 +2982,6 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIAMO_TOPIC_PUT1S_FAILED ),
DEF_VALS1(MQIAMO_TOPIC_PUTS ),
DEF_VALS1(MQIAMO_TOPIC_PUTS_FAILED ),
- DEF_VALS1(MQIAMO_UNSUBS_DUR ),
- DEF_VALS1(MQIAMO_UNSUBS_FAILED ),
- DEF_VALS1(MQIAMO_UNSUBS_NDUR ),
- DEF_VALS2(MQIAMO_AVG_Q_TIME,"MQIAMO64_AVG_Q_TIME"),
- DEF_VALS2(MQIAMO_Q_TIME_AVG,"MQIAMO64_Q_TIME_AVG"),
- DEF_VALS2(MQIAMO_Q_TIME_MAX,"MQIAMO64_Q_TIME_MAX"),
- DEF_VALS2(MQIAMO_Q_TIME_MIN,"MQIAMO64_Q_TIME_MIN"),
- DEF_VALS1(MQIAMO_ACKS_RCVD ),
- DEF_VALS1(MQIAMO_ACK_FEEDBACK ),
- DEF_VALS1(MQIAMO_ACTIVE_ACKERS ),
- DEF_VALS1(MQIAMO_BYTES_SENT ),
- DEF_VALS1(MQIAMO_DEST_DATA_PORT ),
- DEF_VALS1(MQIAMO_DEST_REPAIR_PORT ),
- DEF_VALS1(MQIAMO_FEEDBACK_MODE ),
- DEF_VALS1(MQIAMO_HISTORY_PKTS ),
- DEF_VALS1(MQIAMO_INTERVAL ),
- DEF_VALS1(MQIAMO_LAST_USED ),
- DEF_VALS1(MQIAMO_LATE_JOIN_MARK ),
- DEF_VALS1(MQIAMO_MCAST_BATCH_TIME ),
- DEF_VALS1(MQIAMO_MCAST_HEARTBEAT ),
- DEF_VALS1(MQIAMO_MCAST_XMIT_RATE ),
- DEF_VALS1(MQIAMO_MSGS_DELIVERED ),
- DEF_VALS1(MQIAMO_MSGS_RCVD ),
- DEF_VALS1(MQIAMO_MSGS_SENT ),
- DEF_VALS1(MQIAMO_MSG_BYTES_RCVD ),
- DEF_VALS1(MQIAMO_NACKS_CREATED ),
- DEF_VALS1(MQIAMO_NACKS_RCVD ),
- DEF_VALS1(MQIAMO_NACK_FEEDBACK ),
- DEF_VALS1(MQIAMO_NACK_PKTS_SENT ),
- DEF_VALS1(MQIAMO_NUM_STREAMS ),
- DEF_VALS1(MQIAMO_PENDING_PKTS ),
- DEF_VALS1(MQIAMO_PKTS_DELIVERED ),
- DEF_VALS1(MQIAMO_PKTS_DROPPED ),
- DEF_VALS1(MQIAMO_PKTS_DUPLICATED ),
- DEF_VALS1(MQIAMO_PKTS_LOST ),
- DEF_VALS1(MQIAMO_PKTS_PROCESSED ),
- DEF_VALS1(MQIAMO_PKTS_REPAIRED ),
- DEF_VALS1(MQIAMO_PKTS_SENT ),
- DEF_VALS1(MQIAMO_PKT_RATE ),
- DEF_VALS1(MQIAMO_RELIABILITY_TYPE ),
- DEF_VALS1(MQIAMO_REPAIR_BYTES ),
- DEF_VALS1(MQIAMO_REPAIR_PKTS ),
- DEF_VALS1(MQIAMO_REPAIR_PKTS_RCVD ),
- DEF_VALS1(MQIAMO_REPAIR_PKTS_RQSTD ),
DEF_VALS1(MQIAMO_TOTAL_BYTES_SENT ),
DEF_VALS1(MQIAMO_TOTAL_MSGS_DELIVERED ),
DEF_VALS1(MQIAMO_TOTAL_MSGS_EXPIRED ),
@@ -2925,27 +2995,18 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIAMO_TOTAL_REPAIR_PKTS ),
DEF_VALS1(MQIAMO_TOTAL_REPAIR_PKTS_RCVD ),
DEF_VALS1(MQIAMO_TOTAL_REPAIR_PKTS_RQSTD),
-
- DEF_VALS1(MQIACH_AVAILABLE_CIPHERSPECS ),
- DEF_VALS1(MQIACH_BATCH_DATA_LIMIT ),
- DEF_VALS1(MQIACH_CHANNEL_SUMMARY_ATTRS ),
- DEF_VALS1(MQIACH_DEF_RECONNECT ),
- DEF_VALS1(MQIACH_MATCH ),
- DEF_VALS2(MQIACH_MSGS_RECEIVED,"MQIACH_MSGS_RCVD"),
- DEF_VALS1(MQIACH_MSGS_SENT ),
- DEF_VALS1(MQIACH_PENDING_OUT ),
- DEF_VALS1(MQCACH_REMOTE_VERSION ),
- DEF_VALS1(MQCACH_REMOTE_PRODUCT ),
- DEF_VALS1(MQIACH_RESET_REQUESTED ),
- DEF_VALS1(MQIACH_USER_SOURCE ),
- DEF_VALS1(MQIACH_WARNING ),
+ DEF_VALS1(MQIAMO_UNSUBS_DUR ),
+ DEF_VALS1(MQIAMO_UNSUBS_FAILED ),
+ DEF_VALS1(MQIAMO_UNSUBS_NDUR ),
DEF_VALS1(MQIA_ACCOUNTING_CONN_OVERRIDE ),
DEF_VALS1(MQIA_ACCOUNTING_INTERVAL ),
DEF_VALS1(MQIA_ACCOUNTING_MQI ),
DEF_VALS1(MQIA_ACCOUNTING_Q ),
DEF_VALS1(MQIA_ACTIVE_CHANNELS ),
+ DEF_VALS1(MQIA_ACTIVITY_CONN_OVERRIDE ),
DEF_VALS1(MQIA_ACTIVITY_RECORDING ),
+ DEF_VALS1(MQIA_ACTIVITY_TRACE ),
DEF_VALS1(MQIA_ADOPTNEWMCA_CHECK ),
DEF_VALS1(MQIA_ADOPTNEWMCA_INTERVAL ),
DEF_VALS1(MQIA_ADOPTNEWMCA_TYPE ),
@@ -2959,8 +3020,17 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIA_BASE_TYPE ),
DEF_VALS1(MQIA_BATCH_INTERFACE_AUTO ),
DEF_VALS1(MQIA_BRIDGE_EVENT ),
+ DEF_VALS1(MQIA_CERT_VAL_POLICY ),
+ DEF_VALS1(MQIA_CF_CFCONLOS ),
DEF_VALS1(MQIA_CF_LEVEL ),
+ DEF_VALS1(MQIA_CF_OFFLDUSE ),
+ DEF_VALS1(MQIA_CF_OFFLOAD ),
+ DEF_VALS1(MQIA_CF_OFFLOAD_THRESHOLD1 ),
+ DEF_VALS1(MQIA_CF_OFFLOAD_THRESHOLD2 ),
+ DEF_VALS1(MQIA_CF_OFFLOAD_THRESHOLD3 ),
+ DEF_VALS1(MQIA_CF_RECAUTO ),
DEF_VALS1(MQIA_CF_RECOVER ),
+ DEF_VALS1(MQIA_CF_SMDS_BUFFERS ),
DEF_VALS1(MQIA_CHANNEL_AUTO_DEF ),
DEF_VALS1(MQIA_CHANNEL_AUTO_DEF_EVENT ),
DEF_VALS1(MQIA_CHANNEL_EVENT ),
@@ -2969,6 +3039,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIA_CHINIT_DISPATCHERS ),
DEF_VALS1(MQIA_CHINIT_TRACE_AUTO_START ),
DEF_VALS1(MQIA_CHINIT_TRACE_TABLE_SIZE ),
+ DEF_VALS1(MQIA_CHLAUTH_RECORDS ),
DEF_VALS1(MQIA_CLUSTER_Q_TYPE ),
DEF_VALS1(MQIA_CLUSTER_WORKLOAD_LENGTH ),
DEF_VALS1(MQIA_CLWL_MRU_CHANNELS ),
@@ -2982,11 +3053,14 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIA_CODED_CHAR_SET_ID ),
DEF_VALS1(MQIA_COMMAND_EVENT ),
DEF_VALS1(MQIA_COMMAND_LEVEL ),
+ DEF_VALS1(MQIA_COMM_EVENT ),
+ DEF_VALS1(MQIA_COMM_INFO_TYPE ),
DEF_VALS1(MQIA_CONFIGURATION_EVENT ),
DEF_VALS1(MQIA_CPI_LEVEL ),
DEF_VALS1(MQIA_CURRENT_Q_DEPTH ),
DEF_VALS1(MQIA_DEFINITION_TYPE ),
DEF_VALS1(MQIA_DEF_BIND ),
+ DEF_VALS1(MQIA_DEF_CLUSTER_XMIT_Q_TYPE ),
DEF_VALS1(MQIA_DEF_INPUT_OPEN_OPTION ),
DEF_VALS1(MQIA_DEF_PERSISTENCE ),
DEF_VALS1(MQIA_DEF_PRIORITY ),
@@ -2995,6 +3069,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIA_DIST_LISTS ),
DEF_VALS1(MQIA_DNS_WLM ),
DEF_VALS1(MQIA_DURABLE_SUB ),
+ DEF_VALS1(MQIA_ENCRYPTION_ALGORITHM ),
DEF_VALS1(MQIA_EXPIRY_INTERVAL ),
DEF_VALS1(MQIA_GROUP_UR ),
DEF_VALS1(MQIA_HARDEN_GET_BACKOUT ),
@@ -3027,6 +3102,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIA_MAX_Q_TRIGGERS ),
DEF_VALS1(MQIA_MAX_RECOVERY_TASKS ),
DEF_VALS1(MQIA_MAX_UNCOMMITTED_MSGS ),
+ DEF_VALS1(MQIA_MCAST_BRIDGE ),
DEF_VALS1(MQIA_MONITORING_AUTO_CLUSSDR ),
DEF_VALS1(MQIA_MONITORING_CHANNEL ),
DEF_VALS1(MQIA_MONITORING_Q ),
@@ -3035,6 +3111,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIA_MSG_DEQ_COUNT ),
DEF_VALS1(MQIA_MSG_ENQ_COUNT ),
DEF_VALS1(MQIA_MSG_MARK_BROWSE_INTERVAL ),
+ DEF_VALS1(MQIA_MULTICAST ),
DEF_VALS1(MQIA_NAMELIST_TYPE ),
DEF_VALS1(MQIA_NAME_COUNT ),
DEF_VALS1(MQIA_NPM_CLASS ),
@@ -3047,8 +3124,11 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIA_PERFORMANCE_EVENT ),
DEF_VALS1(MQIA_PLATFORM ),
DEF_VALS1(MQIA_PM_DELIVERY ),
+ DEF_VALS1(MQIA_POLICY_VERSION ),
DEF_VALS1(MQIA_PROPERTY_CONTROL ),
+ DEF_VALS1(MQIA_PROT_POLICY_CAPABILITY ),
DEF_VALS1(MQIA_PROXY_SUB ),
+ DEF_VALS1(MQIA_PUBSUB_CLUSTER ),
DEF_VALS1(MQIA_PUBSUB_MAXMSG_RETRY_COUNT),
DEF_VALS1(MQIA_PUBSUB_MODE ),
DEF_VALS1(MQIA_PUBSUB_NP_MSG ),
@@ -3100,6 +3180,7 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIA_SERVICE_TYPE ),
DEF_VALS1(MQIA_SHAREABILITY ),
DEF_VALS1(MQIA_SHARED_Q_Q_MGR_NAME ),
+ DEF_VALS1(MQIA_SIGNATURE_ALGORITHM ),
DEF_VALS1(MQIA_SSL_EVENT ),
DEF_VALS1(MQIA_SSL_FIPS_REQUIRED ),
DEF_VALS1(MQIA_SSL_RESET_COUNT ),
@@ -3110,13 +3191,16 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIA_STATISTICS_INTERVAL ),
DEF_VALS1(MQIA_STATISTICS_MQI ),
DEF_VALS1(MQIA_STATISTICS_Q ),
+ DEF_VALS1(MQIA_SUB_CONFIGURATION_EVENT ),
DEF_VALS1(MQIA_SUB_COUNT ),
DEF_VALS1(MQIA_SUB_SCOPE ),
+ DEF_VALS1(MQIA_SUITE_B_STRENGTH ),
DEF_VALS1(MQIA_SYNCPOINT ),
DEF_VALS1(MQIA_TCP_CHANNELS ),
DEF_VALS1(MQIA_TCP_KEEP_ALIVE ),
DEF_VALS1(MQIA_TCP_STACK_TYPE ),
DEF_VALS1(MQIA_TIME_SINCE_RESET ),
+ DEF_VALS1(MQIA_TOLERATE_UNPROTECTED ),
DEF_VALS1(MQIA_TOPIC_DEF_PERSISTENCE ),
DEF_VALS1(MQIA_TOPIC_TYPE ),
DEF_VALS1(MQIA_TRACE_ROUTE_RECORDING ),
@@ -3130,25 +3214,8 @@ DEF_VALSBX(PrmId)
DEF_VALS1(MQIA_UR_DISP ),
DEF_VALS1(MQIA_USAGE ),
DEF_VALS1(MQIA_USER_LIST ),
- DEF_VALS1(MQIA_WILDCARD_OPERATION ),
- DEF_VALS1(MQIA_ACTIVITY_CONN_OVERRIDE ),
- DEF_VALS1(MQIA_ACTIVITY_TRACE ),
- DEF_VALS1(MQIA_CERT_VAL_POLICY ),
- DEF_VALS1(MQIA_CHLAUTH_RECORDS ),
- DEF_VALS1(MQIA_COMM_EVENT ),
- DEF_VALS1(MQIA_COMM_INFO_TYPE ),
- DEF_VALS1(MQIA_DEF_CLUSTER_XMIT_Q_TYPE ),
- DEF_VALS1(MQIA_ENCRYPTION_ALGORITHM ),
- DEF_VALS1(MQIA_MCAST_BRIDGE ),
- DEF_VALS1(MQIA_MULTICAST ),
- DEF_VALS1(MQIA_POLICY_VERSION ),
- DEF_VALS1(MQIA_PROT_POLICY_CAPABILITY ),
- DEF_VALS1(MQIA_PUBSUB_CLUSTER ),
- DEF_VALS1(MQIA_SIGNATURE_ALGORITHM ),
- DEF_VALS1(MQIA_SUB_CONFIGURATION_EVENT ),
- DEF_VALS1(MQIA_SUITE_B_STRENGTH ),
- DEF_VALS1(MQIA_TOLERATE_UNPROTECTED ),
DEF_VALS1(MQIA_USE_DEAD_LETTER_Q ),
+ DEF_VALS1(MQIA_WILDCARD_OPERATION ),
DEF_VALS1(MQIA_XR_CAPABILITY ),
DEF_VALSE;
DEF_VALS_EXTBX(PrmId);
@@ -3222,45 +3289,6 @@ DEF_VALSB(RemoveQueuesOptions)
DEF_VALSE;
#endif
-#if 0
-DEF_VALSB(CFRecover)
- DEF_VALS1(MQCFR_YES),
- DEF_VALS1(MQCFR_NO ),
-DEF_VALSE;
-#endif
-
-#if 0
-DEF_VALSB(CFStatus)
- DEF_VALS1(MQCFSTATUS_NOT_FOUND ),
- DEF_VALS1(MQCFSTATUS_ACTIVE ),
- DEF_VALS1(MQCFSTATUS_IN_RECOVER ),
- DEF_VALS1(MQCFSTATUS_IN_BACKUP ),
- DEF_VALS1(MQCFSTATUS_FAILED ),
- DEF_VALS1(MQCFSTATUS_NONE ),
- DEF_VALS1(MQCFSTATUS_UNKNOWN ),
- DEF_VALS1(MQCFSTATUS_ADMIN_INCOMPLETE ),
- DEF_VALS1(MQCFSTATUS_NEVER_USED ),
- DEF_VALS1(MQCFSTATUS_NO_BACKUP ),
- DEF_VALS1(MQCFSTATUS_NOT_FAILED ),
- DEF_VALS1(MQCFSTATUS_NOT_RECOVERABLE ),
- DEF_VALS1(MQCFSTATUS_XES_ERROR ),
-DEF_VALSE;
-#endif
-
-#if 0
-DEF_VALSB(CFStatusType)
- DEF_VALS1(MQIACF_CF_STATUS_SUMMARY ),
- DEF_VALS1(MQIACF_CF_STATUS_CONNECT ),
- DEF_VALS1(MQIACF_CF_STATUS_BACKUP ),
-DEF_VALSE;
-#endif
-
-#if 0
-DEF_VALSB(CFStructType)
- DEF_VALS1(MQCFTYPE_APPL ),
- DEF_VALS1(MQCFTYPE_ADMIN ),
-DEF_VALSE;
-#endif
DEF_VALSB(IndoubtStatus)
DEF_VALS1(MQCHIDS_NOT_INDOUBT ),
@@ -4081,20 +4109,130 @@ DEF_VALSBX(TaskEndStatus)
DEF_VALS1(MQCTES_ENDTASK),
DEF_VALSE;
+DEF_VALSB(CFRecoverability)
+ DEF_VALS1(MQCFR_YES),
+ DEF_VALS1(MQCFR_NO ),
+DEF_VALSE;
+DEF_VALSB(DSBlock)
+ DEF_VALS1(MQDSB_DEFAULT),
+ DEF_VALS1(MQDSB_8K ),
+ DEF_VALS1(MQDSB_16K ),
+ DEF_VALS1(MQDSB_32K ),
+ DEF_VALS1(MQDSB_64K ),
+ DEF_VALS1(MQDSB_128K ),
+ DEF_VALS1(MQDSB_256K ),
+ DEF_VALS1(MQDSB_512K ),
+ DEF_VALS1(MQDSB_1024K ),
+ DEF_VALS1(MQDSB_1M ),
+DEF_VALSE;
+DEF_VALSB(DSExpand)
+ DEF_VALS1(MQDSE_DEFAULT),
+ DEF_VALS1(MQDSE_YES ),
+ DEF_VALS1(MQDSE_NO ),
+DEF_VALSE;
+DEF_VALSB(OffloadUse)
+ DEF_VALS1(MQCFOFFLD_NONE),
+ DEF_VALS1(MQCFOFFLD_SMDS),
+ DEF_VALS1(MQCFOFFLD_DB2 ),
+ DEF_VALS1(MQCFOFFLD_BOTH),
+DEF_VALSE;
+DEF_VALSB(CFAutomaticRecovery)
+ DEF_VALS1(MQRECAUTO_NO ),
+ DEF_VALS1(MQRECAUTO_YES),
+DEF_VALSE;
+DEF_VALSB(CFLossConnectivity)
+ DEF_VALS1(MQCFCONLOS_TERMINATE),
+ DEF_VALS1(MQCFCONLOS_TOLERATE ),
+ DEF_VALS1(MQCFCONLOS_ASQMGR ),
+DEF_VALSE;
+DEF_VALSB(CFStatus)
+ DEF_VALS1(MQCFSTATUS_NOT_FOUND ),
+ DEF_VALS1(MQCFSTATUS_ACTIVE ),
+ DEF_VALS1(MQCFSTATUS_IN_RECOVER ),
+ DEF_VALS1(MQCFSTATUS_IN_BACKUP ),
+ DEF_VALS1(MQCFSTATUS_FAILED ),
+ DEF_VALS1(MQCFSTATUS_NONE ),
+ DEF_VALS1(MQCFSTATUS_UNKNOWN ),
+ DEF_VALS1(MQCFSTATUS_ADMIN_INCOMPLETE ),
+ DEF_VALS1(MQCFSTATUS_NEVER_USED ),
+ DEF_VALS1(MQCFSTATUS_NO_BACKUP ),
+ DEF_VALS1(MQCFSTATUS_NOT_FAILED ),
+ DEF_VALS1(MQCFSTATUS_NOT_RECOVERABLE ),
+ DEF_VALS1(MQCFSTATUS_XES_ERROR ),
+DEF_VALSE;
+DEF_VALSB(CFStatusType)
+ DEF_VALS1(MQIACF_CF_STATUS_SUMMARY ),
+ DEF_VALS1(MQIACF_CF_STATUS_CONNECT ),
+ DEF_VALS1(MQIACF_CF_STATUS_BACKUP ),
+ DEF_VALS1(MQIACF_CF_STATUS_SMDS ),
+DEF_VALSE;
+DEF_VALSB(CFStructType)
+ DEF_VALS1(MQCFTYPE_APPL ),
+ DEF_VALS1(MQCFTYPE_ADMIN ),
+DEF_VALSE;
+DEF_VALSB(AccessOptions)
+ DEF_VALS1(MQCFACCESS_ENABLED ),
+ DEF_VALS1(MQCFACCESS_SUSPENDED),
+ DEF_VALS1(MQCFACCESS_DISABLED ),
+DEF_VALSE;
+DEF_VALSB(OpenMode)
+ DEF_VALS1(MQS_OPENMODE_NONE ),
+ DEF_VALS1(MQS_OPENMODE_READONLY),
+ DEF_VALS1(MQS_OPENMODE_UPDATE ),
+ DEF_VALS1(MQS_OPENMODE_RECOVERY),
+DEF_VALSE;
+DEF_VALSB(SMDSStatus)
+ DEF_VALS1(MQS_STATUS_CLOSED ),
+ DEF_VALS1(MQS_STATUS_CLOSING ),
+ DEF_VALS1(MQS_STATUS_OPENING ),
+ DEF_VALS1(MQS_STATUS_OPEN ),
+ DEF_VALS1(MQS_STATUS_NOTENABLED),
+ DEF_VALS1(MQS_STATUS_ALLOCFAIL ),
+ DEF_VALS1(MQS_STATUS_OPENFAIL ),
+ DEF_VALS1(MQS_STATUS_STGFAIL ),
+ DEF_VALS1(MQS_STATUS_DATAFAIL ),
+DEF_VALSE;
+DEF_VALSB(SMDSAvail)
+ DEF_VALS1(MQS_AVAIL_NORMAL ),
+ DEF_VALS1(MQS_AVAIL_ERROR ),
+ DEF_VALS1(MQS_AVAIL_STOPPED),
+DEF_VALSE;
+DEF_VALSB(SMDSExpandSt)
+ DEF_VALS1(MQS_EXPANDST_NORMAL ),
+ DEF_VALS1(MQS_EXPANDST_FAILED ),
+ DEF_VALS1(MQS_EXPANDST_MAXIMUM),
+DEF_VALSE;
+DEF_VALSB(UsageType)
+ DEF_VALS1(MQIACF_USAGE_BUFFER_POOL),
+ DEF_VALS1(MQIACF_USAGE_DATA_SET ),
+ DEF_VALS1(MQIACF_USAGE_PAGESET ),
+ DEF_VALS1(MQIACF_USAGE_SMDS ),
+DEF_VALSE;
+DEF_VALSB(SMDSUsage)
+ DEF_VALS1(MQUSAGE_SMDS_AVAILABLE),
+ DEF_VALS1(MQUSAGE_SMDS_NO_DATA),
+DEF_VALSE;
DEF_VALSBX(MQCFINT_Parse)
DEF_VALS2(MQIACF_ASYNC_STATE ,GET_VALSP(AsynchronousStateValues)),
DEF_VALS2(MQIACF_DB2_CONN_STATUS ,GET_VALSP(QSGStatus)),
+ DEF_VALS2(MQIACF_CF_SMDS_BLOCK_SIZE ,GET_VALSP(DSBlock)),
+ DEF_VALS2(MQIACF_CF_SMDS_EXPAND ,GET_VALSP(DSExpand)),
+ DEF_VALS2(MQIACF_CF_STATUS_TYPE ,GET_VALSP(CFStatusType)),
+ DEF_VALS2(MQIACF_CF_STRUC_ATTRS ,GET_VALSP(PrmId)),
+ DEF_VALS2(MQIACF_CF_STRUC_ACCESS ,GET_VALSP(AccessOptions)),
+ DEF_VALS2(MQIACF_CF_STRUC_STATUS ,GET_VALSP(CFStatus)),
+ DEF_VALS2(MQIACF_CF_STRUC_TYPE ,GET_VALSP(CFStructType)),
DEF_VALS2(MQIACF_CHLAUTH_TYPE ,GET_VALSP(ChlauthType)),
DEF_VALS2(MQIACF_CLUSTER_Q_MGR_ATTRS ,GET_VALSP(PrmId)),
DEF_VALS2(MQIACF_COMMAND ,GET_VALSP(mqcmd)),
DEF_VALS2(MQIACF_COMMAND_INFO ,GET_VALSP(CommandInformationValues)),
-
DEF_VALS2(MQIACF_CONNECTION_ATTRS ,GET_VALSP(PrmId)),
DEF_VALS2(MQIACF_CONN_INFO_TYPE ,GET_VALSP(ConnInfoType)),
DEF_VALS2(MQIACF_EVENT_APPL_TYPE ,GET_VALSP(mqat)),
DEF_VALS2(MQIACF_EVENT_ORIGIN ,GET_VALSP(EvtOrig)),
DEF_VALS2(MQIACF_HANDLE_STATE ,GET_VALSP(HandleStates)),
DEF_VALS2(MQIACF_OBJECT_TYPE ,GET_VALSP(objtype)),
+ DEF_VALS2(MQIACF_USAGE_OFFLOAD_MSGS ,GET_VALSP(OffloadUse)),
DEF_VALS2(MQIACF_OPEN_BROWSE ,GET_VALSP(QueueStatusOptionsYesNo)),
DEF_VALS2(MQIACF_OPEN_INPUT_TYPE ,GET_VALSP(QueueStatusOpenOptions)),
DEF_VALS2(MQIACF_OPEN_INQUIRE ,GET_VALSP(QueueStatusOptionsYesNo)),
@@ -4109,8 +4247,14 @@ DEF_VALSBX(MQCFINT_Parse)
DEF_VALS2(MQIACF_Q_STATUS_ATTRS ,GET_VALSP(PrmId)),
DEF_VALS2(MQIACF_Q_STATUS_TYPE ,GET_VALSP(PrmId)),
DEF_VALS2(MQIACF_Q_TYPES ,GET_VALSP(QueueType)),
+ DEF_VALS2(MQIACF_SMDS_AVAIL ,GET_VALSP(SMDSAvail)),
+ DEF_VALS2(MQIACF_SMDS_EXPANDST ,GET_VALSP(SMDSExpandSt)),
+ DEF_VALS2(MQIACF_SMDS_OPENMODE ,GET_VALSP(OpenMode)),
+ DEF_VALS2(MQIACF_SMDS_STATUS ,GET_VALSP(SMDSStatus)),
DEF_VALS2(MQIACF_UOW_STATE ,GET_VALSP(UOWStates)),
DEF_VALS2(MQIACF_UOW_TYPE ,GET_VALSP(UOWTypes)),
+ DEF_VALS2(MQIACF_USAGE_SMDS ,GET_VALSP(SMDSUsage)),
+ DEF_VALS2(MQIACF_USAGE_TYPE ,GET_VALSP(UsageType)),
DEF_VALS2(MQIACH_CHANNEL_DISP ,GET_VALSP(ChannelDisp)),
DEF_VALS2(MQIACH_CHANNEL_INSTANCE_TYPE ,GET_VALSP(objtype)),
DEF_VALS2(MQIACH_CHANNEL_STATUS ,GET_VALSP(ChannelStatus)),
@@ -4142,6 +4286,11 @@ DEF_VALSBX(MQCFINT_Parse)
DEF_VALS2(MQIA_BASE_TYPE ,GET_VALSP(BaseType)),
DEF_VALS2(MQIA_BRIDGE_EVENT ,GET_VALSP(EventRule)),
DEF_VALS2(MQIA_CERT_VAL_POLICY ,GET_VALSP(CertValPolicy)),
+ DEF_VALS2(MQIA_CF_CFCONLOS ,GET_VALSP(CFLossConnectivity)),
+ DEF_VALS2(MQIA_CF_OFFLOAD ,GET_VALSP(OffloadUse)),
+ DEF_VALS2(MQIA_CF_OFFLDUSE ,GET_VALSP(OffloadUse)),
+ DEF_VALS2(MQIA_CF_RECAUTO ,GET_VALSP(CFAutomaticRecovery)),
+ DEF_VALS2(MQIA_CF_RECOVER ,GET_VALSP(CFRecoverability)),
DEF_VALS2(MQIA_CHANNEL_AUTO_DEF ,GET_VALSP(ChanAutoDef)),
DEF_VALS2(MQIA_CHANNEL_AUTO_DEF_EVENT ,GET_VALSP(EventRule)),
DEF_VALS2(MQIA_CHANNEL_EVENT ,GET_VALSP(EventRule)),
diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c
index b5a084997f..61afaa2aac 100644
--- a/epan/dissectors/packet-mq-pcf.c
+++ b/epan/dissectors/packet-mq-pcf.c
@@ -38,6 +38,7 @@
#include <epan/expert.h>
#include <epan/prefs.h>
#include <epan/strutil.h>
+
#include "packet-mq.h"
void proto_register_mqpcf(void);
@@ -115,7 +116,8 @@ static const guint8 *dissect_mqpcf_parm_getintval(guint uPrm, guint uVal)
}
static void dissect_mqpcf_parm_int(tvbuff_t *tvb, proto_tree *tree, guint offset, guint uPrm,
- guint uVal, int hfindex, guint iCnt, guint iMaxCnt, guint iDigit, gboolean bParse)
+ guint uVal, int hfindex, guint iCnt, guint iMaxCnt,
+ guint iDigit, gboolean bParse)
{
header_field_info *hfinfo;
const guint8 *pVal = NULL;
@@ -153,8 +155,8 @@ static void dissect_mqpcf_parm_int(tvbuff_t *tvb, proto_tree *tree, guint offset
}
}
-static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq_tree,
- guint offset, guint32 uCount, guint bLittleEndian, gboolean bParse)
+void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq_tree,
+ guint offset, guint32 uCount, guint bLittleEndian, gboolean bParse)
{
guint32 u = 0;
guint32 tOfs = 0;
@@ -185,7 +187,7 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
uCnt = 0;
while (tvb_reported_length_remaining(tvb, xOfs) >= 16)
{
- uLen = tvb_get_guint32_endian(tvb, xOfs + 4, bLittleEndian);
+ uLen = tvb_get_guint32(tvb, xOfs + 4, bLittleEndian);
if (uLen < 16)
{
proto_tree_add_expert_format(tree, pinfo, &ei_mq_pcf_PrmCnt, tvb, xOfs, 16, sPrmCnt, uLen, uCnt);
@@ -202,15 +204,15 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
for (u = 0; u < uCount && u < mq_pcf_maxprm; u++)
{
tOfs = offset;
- uTyp = tvb_get_guint32_endian(tvb, offset , bLittleEndian);
- uLen = tvb_get_guint32_endian(tvb, offset + 4, bLittleEndian);
+ uTyp = tvb_get_guint32(tvb, offset , bLittleEndian);
+ uLen = tvb_get_guint32(tvb, offset + 4, bLittleEndian);
if (uLen == 0)
{
proto_tree_add_expert_format(tree, pinfo, &ei_mq_pcf_prmln0, tvb, offset, 12, sPrmLn0, u+1, uCount);
u = uCount;
break;
}
- uPrm = tvb_get_guint32_endian(tvb, offset + 8, bLittleEndian);
+ uPrm = tvb_get_guint32(tvb, offset + 8, bLittleEndian);
uLenF = 12;
if (bParse)
@@ -235,7 +237,7 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
case MQ_MQCFT_INTEGER:
{
const guint8 *pVal = NULL;
- uVal = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
+ uVal = tvb_get_guint32(tvb, offset + uLenF, bLittleEndian);
if (bParse)
pVal = dissect_mqpcf_parm_getintval(uPrm, uVal);
@@ -261,8 +263,8 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
{
guint8 *sStr;
- uCCS = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
- uSLn = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
+ uCCS = tvb_get_guint32(tvb, offset + uLenF, bLittleEndian);
+ uSLn = tvb_get_guint32(tvb, offset + uLenF + 4, bLittleEndian);
sStr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 8,
uSLn, (uCCS != 500) ? ENC_ASCII : ENC_EBCDIC);
if (*sStr)
@@ -286,7 +288,7 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
guint32 u2;
guint32 uDigit = 0;
- uCnt = tvb_get_guint32_endian(tvb, offset+uLenF, bLittleEndian);
+ uCnt = tvb_get_guint32(tvb, offset+uLenF, bLittleEndian);
uDigit = dissect_mqpcf_getDigits(uCnt);
tree = proto_tree_add_subtree_format(mq_tree, tvb, offset, uLen, ett_mqpcf_prm, &ti, "%s Cnt(%d)", strPrm, uCnt);
@@ -299,7 +301,7 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
offset += uLenF+4;
for (u2 = 0; u2 < uCnt && u2 < mq_pcf_maxlst; u2++)
{
- uVal = tvb_get_guint32_endian(tvb, offset, bLittleEndian);
+ uVal = tvb_get_guint32(tvb, offset, bLittleEndian);
dissect_mqpcf_parm_int(tvb, tree, offset, uPrm, uVal, hf_mq_pcf_intlist, u2+1, uCnt, uDigit, bParse);
offset += 4;
}
@@ -318,9 +320,9 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
hfinfo = proto_registrar_get_nth(hf_mq_pcf_stringlist);
- uCCS = tvb_get_guint32_endian(tvb, offset + uLenF , bLittleEndian);
- uCnt = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
- uSLn = tvb_get_guint32_endian(tvb, offset + uLenF + 8, bLittleEndian);
+ uCCS = tvb_get_guint32(tvb, offset + uLenF , bLittleEndian);
+ uCnt = tvb_get_guint32(tvb, offset + uLenF + 4, bLittleEndian);
+ uSLn = tvb_get_guint32(tvb, offset + uLenF + 8, bLittleEndian);
tree = proto_tree_add_subtree_format(mq_tree, tvb, offset, uLen, ett_mqpcf_prm, NULL, "%s Cnt(%d)", strPrm, uCnt);
@@ -367,7 +369,7 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
break;
case MQ_MQCFT_BYTE_STRING:
{
- uSLn = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
+ uSLn = tvb_get_guint32(tvb, offset + uLenF, bLittleEndian);
if (uSLn)
{
guint8 *sStrA = (guint8 *)format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 4, uSLn, ENC_ASCII) , uSLn, '.');
@@ -404,8 +406,8 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
{
guint32 uOpe;
- uOpe = tvb_get_guint32_endian(tvb, offset + uLenF , bLittleEndian);
- uVal = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
+ uOpe = tvb_get_guint32(tvb, offset + uLenF , bLittleEndian);
+ uVal = tvb_get_guint32(tvb, offset + uLenF + 4, bLittleEndian);
tree = proto_tree_add_subtree_format(mq_tree, tvb, offset, uLen, ett_mqpcf_prm, NULL, "%s %s %8x-(%9d)",
strPrm, val_to_str(uOpe, GET_VALSV(FilterOP), " Unknown (0x%02x)")+7, uVal, uVal);
@@ -423,9 +425,9 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
guint8 *sStr;
guint32 uOpe;
- uOpe = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
- uCCS = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
- uSLn = tvb_get_guint32_endian(tvb, offset + uLenF + 8, bLittleEndian);
+ uOpe = tvb_get_guint32(tvb, offset + uLenF, bLittleEndian);
+ uCCS = tvb_get_guint32(tvb, offset + uLenF + 4, bLittleEndian);
+ uSLn = tvb_get_guint32(tvb, offset + uLenF + 8, bLittleEndian);
sStr = (guint8 *)format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 12, uSLn, (uCCS != 500) ? ENC_ASCII : ENC_EBCDIC), uSLn, '.');
strip_trailing_blanks(sStr, uSLn);
@@ -445,8 +447,8 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
case MQ_MQCFT_BYTE_STRING_FILTER:
{
guint32 uOpe;
- uOpe = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
- uSLn = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
+ uOpe = tvb_get_guint32(tvb, offset + uLenF, bLittleEndian);
+ uSLn = tvb_get_guint32(tvb, offset + uLenF + 4, bLittleEndian);
if (uSLn)
{
guint8 *sStrA = (guint8 *)format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 8, uSLn, ENC_ASCII), uSLn, '.');
@@ -485,7 +487,7 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
break;
case MQ_MQCFT_INTEGER64:
{
- uVal64 = tvb_get_guint64_endian(tvb, offset + uLenF + 4, bLittleEndian);
+ uVal64 = tvb_get_guint64(tvb, offset + uLenF + 4, bLittleEndian);
tree = proto_tree_add_subtree_format(mq_tree, tvb, offset, uLen, ett_mqpcf_prm, NULL,
"%s %" G_GINT64_MODIFIER "x (%" G_GINT64_MODIFIER "d)", strPrm, uVal64, uVal64);
@@ -505,7 +507,7 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
hfinfo = proto_registrar_get_nth(hf_mq_pcf_int64list);
- uCnt = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
+ uCnt = tvb_get_guint32(tvb, offset + uLenF, bLittleEndian);
tree = proto_tree_add_subtree_format(mq_tree, tvb, offset, uLen, ett_mqpcf_prm, NULL, "%s Cnt(%d)", strPrm, uCnt);
uDigit = dissect_mqpcf_getDigits(uCnt);
@@ -517,7 +519,7 @@ static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq
offset += uLenF + 4;
for (u2 = 0; u2 < uCnt && u2 < mq_pcf_maxlst; u2++)
{
- uVal64 = tvb_get_guint64_endian(tvb, offset, bLittleEndian);
+ uVal64 = tvb_get_guint64(tvb, offset, bLittleEndian);
proto_tree_add_int64_format(tree, hf_mq_pcf_int64list, tvb, offset, 8, uVal64,
"%s[%*d]: %" G_GINT64_MODIFIER "x (%" G_GINT64_MODIFIER "d)",
hfinfo->name, uDigit, u2+1, uVal64, uVal64);
@@ -548,7 +550,7 @@ static void dissect_mqpcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, m
if (tvb_reported_length(tvb) >= 36)
{
gint iSizeMQCFH = 36;
- guint32 iCommand = tvb_get_guint32_endian(tvb, offset + 12, bLittleEndian);
+ guint32 iCommand = tvb_get_guint32(tvb, offset + 12, bLittleEndian);
if (tree)
{
@@ -562,11 +564,11 @@ static void dissect_mqpcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, m
guint32 uCC;
guint32 uRC;
- uTyp = tvb_get_guint32_endian(tvb, offset , bLittleEndian);
- uCmd = tvb_get_guint32_endian(tvb, offset + 12, bLittleEndian);
- uCC = tvb_get_guint32_endian(tvb, offset + 24, bLittleEndian);
- uRC = tvb_get_guint32_endian(tvb, offset + 28, bLittleEndian);
- uCnt = tvb_get_guint32_endian(tvb, offset + 32, bLittleEndian);
+ uTyp = tvb_get_guint32(tvb, offset , bLittleEndian);
+ uCmd = tvb_get_guint32(tvb, offset + 12, bLittleEndian);
+ uCC = tvb_get_guint32(tvb, offset + 24, bLittleEndian);
+ uRC = tvb_get_guint32(tvb, offset + 28, bLittleEndian);
+ uCnt = tvb_get_guint32(tvb, offset + 32, bLittleEndian);
if (uCC || uRC)
{
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index 4b0cd18804..998dded739 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -68,15 +68,16 @@
#include "config.h"
#include <epan/packet.h>
+#include <epan/ptvcursor.h>
#include <epan/exceptions.h>
#include <epan/reassemble.h>
-
#include <epan/prefs.h>
#include <epan/strutil.h>
#include "packet-windows-common.h"
#include "packet-tcp.h"
+
#include "packet-mq.h"
void proto_register_mq(void);
@@ -258,9 +259,9 @@ static int hf_mq_id_ief2_MsgCmpLst = -1;
static int hf_mq_id_ief2_SSLReset = -1;
static const int *pf_flds_ief2[] =
{
- &hf_mq_id_ief2_HdrCmpLst,
- &hf_mq_id_ief2_MsgCmpLst,
&hf_mq_id_ief2_SSLReset ,
+ &hf_mq_id_ief2_MsgCmpLst,
+ &hf_mq_id_ief2_HdrCmpLst,
NULL
};
@@ -291,8 +292,9 @@ static int hf_mq_conn_options = -1;
static int hf_mq_fcno_StructID = -1;
static int hf_mq_fcno_msgid = -1;
static int hf_mq_fcno_mqmid = -1;
-static int hf_mq_fcno_unknown00 = -1;
-static int hf_mq_fcno_unknown01 = -1;
+static int hf_mq_fcno_version = -1;
+static int hf_mq_fcno_option = -1;
+static int hf_mq_fcno_connid = -1;
static int hf_mq_fcno_unknown02 = -1;
static int hf_mq_inq_nbsel = -1;
@@ -992,7 +994,6 @@ static reassembly_table mq_reassembly_table;
#define MQ_STRUCTID_SPxI 0x53500049 /* SPxI */
#define MQ_STRUCTID_SPxO 0x5350004F /* SPxO */
#define MQ_STRUCTID_SPxU 0x53500055 /* SPxU */
-
#define MQ_STRUCTID_SPAI 0x53504149 /* SPI Activate In */
#define MQ_STRUCTID_SPAO 0x5350414F /* SPI Activate Out */
#define MQ_STRUCTID_SPAU 0x53504155 /* SPI Activate InOut */
@@ -1008,7 +1009,6 @@ static reassembly_table mq_reassembly_table;
#define MQ_STRUCTID_SPQI 0x53505149 /* SPI Query In */
#define MQ_STRUCTID_SPQO 0x5350514F /* SPI Query Out */
#define MQ_STRUCTID_SPQU 0x53505155 /* SPI Query InOut */
-
#define MQ_STRUCTID_TM 0x544D2020
#define MQ_STRUCTID_TMC2 0x544D4332
@@ -1044,7 +1044,6 @@ static reassembly_table mq_reassembly_table;
#define MQ_STRUCTID_SPxI_EBCDIC 0xE2D700C9 /* SPxI */
#define MQ_STRUCTID_SPxO_EBCDIC 0xE2D700D6 /* SPxO */
#define MQ_STRUCTID_SPxU_EBCDIC 0xE2D700E4 /* SPxU */
-
#define MQ_STRUCTID_SPAI_EBCDIC 0xE2D7C1C9 /* SPI Activate In */
#define MQ_STRUCTID_SPAO_EBCDIC 0xE2D7C1D6 /* SPI Activate Out */
#define MQ_STRUCTID_SPAU_EBCDIC 0xE2D7C1E4 /* SPI Activate InOut */
@@ -1060,7 +1059,6 @@ static reassembly_table mq_reassembly_table;
#define MQ_STRUCTID_SPQI_EBCDIC 0xE2D7D8C9 /* SPI Query In */
#define MQ_STRUCTID_SPQO_EBCDIC 0xE2D7D8D6 /* SPI Query Out */
#define MQ_STRUCTID_SPQU_EBCDIC 0xE2D7D8E4 /* SPI Query InOut */
-
#define MQ_STRUCTID_TM_EBCDIC 0xE3D44040
#define MQ_STRUCTID_TMC2_EBCDIC 0xE3D4C3F2
@@ -1565,7 +1563,6 @@ DEF_VALSB(StructID)
DEF_VALS2(STRUCTID_PMO , MQ_TEXT_PMO),
DEF_VALS2(STRUCTID_RFH , MQ_TEXT_RFH),
DEF_VALS2(STRUCTID_RMH , MQ_TEXT_RMH),
-
DEF_VALS2(STRUCTID_SPAI , MQ_TEXT_SPAI),
DEF_VALS2(STRUCTID_SPAO , MQ_TEXT_SPAO),
DEF_VALS2(STRUCTID_SPAU , MQ_TEXT_SPAU),
@@ -1581,7 +1578,6 @@ DEF_VALSB(StructID)
DEF_VALS2(STRUCTID_SPQI , MQ_TEXT_SPQI),
DEF_VALS2(STRUCTID_SPQO , MQ_TEXT_SPQO),
DEF_VALS2(STRUCTID_SPQU , MQ_TEXT_SPQU),
-
DEF_VALS2(STRUCTID_TM , MQ_TEXT_TM),
DEF_VALS2(STRUCTID_TMC2 , MQ_TEXT_TMC2),
@@ -1608,7 +1604,6 @@ DEF_VALSB(StructID)
DEF_VALS2(STRUCTID_PMO_EBCDIC , MQ_TEXT_PMO),
DEF_VALS2(STRUCTID_RFH_EBCDIC , MQ_TEXT_RFH),
DEF_VALS2(STRUCTID_RMH_EBCDIC , MQ_TEXT_RMH),
-
DEF_VALS2(STRUCTID_SPAI_EBCDIC, MQ_TEXT_SPAI),
DEF_VALS2(STRUCTID_SPAO_EBCDIC, MQ_TEXT_SPAO),
DEF_VALS2(STRUCTID_SPAU_EBCDIC, MQ_TEXT_SPAU),
@@ -1624,14 +1619,12 @@ DEF_VALSB(StructID)
DEF_VALS2(STRUCTID_SPQI_EBCDIC, MQ_TEXT_SPQI),
DEF_VALS2(STRUCTID_SPQO_EBCDIC, MQ_TEXT_SPQO),
DEF_VALS2(STRUCTID_SPQU_EBCDIC, MQ_TEXT_SPQU),
-
DEF_VALS2(STRUCTID_TM_EBCDIC , MQ_TEXT_TM),
DEF_VALS2(STRUCTID_TMC2_EBCDIC, MQ_TEXT_TMC2),
DEF_VALS2(STRUCTID_TSH_EBCDIC , MQ_TEXT_TSH),
DEF_VALS2(STRUCTID_TSHC_EBCDIC, MQ_TEXT_TSHC),
DEF_VALS2(STRUCTID_TSHM_EBCDIC, MQ_TEXT_TSHM),
-
DEF_VALS2(STRUCTID_UID_EBCDIC , MQ_TEXT_UID),
DEF_VALS2(STRUCTID_WIH_EBCDIC , MQ_TEXT_WIH),
DEF_VALS2(STRUCTID_XQH_EBCDIC , MQ_TEXT_XQH),
@@ -1662,11 +1655,11 @@ static gint dissect_mq_encoding(proto_tree *tree, int hfindex, tvbuff_t *tvb, co
if (length == 2)
{
- uEnc = (gint)tvb_get_guint16_endian(tvb, start, encoding);
+ uEnc = (gint)tvb_get_guint16(tvb, start, encoding);
}
else
{
- uEnc = tvb_get_guint32_endian(tvb, start, encoding);
+ uEnc = tvb_get_guint32(tvb, start, encoding);
}
pEnc = sEnc;
@@ -1744,7 +1737,7 @@ static gint dissect_mq_MQMO(tvbuff_t *tvb, proto_tree *mq_tree, gint offset, gin
{
guint uMoOpt;
- uMoOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+ uMoOpt = tvb_get_guint32(tvb, offset, p_mq_parm->mq_int_enc);
if (uMoOpt == 0)
{
@@ -1764,7 +1757,7 @@ static gint dissect_mq_LPOO_LPIOPTS(tvbuff_t *tvb, proto_tree *mq_tree, gint off
{
guint uLpiOpts;
- uLpiOpts = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+ uLpiOpts = tvb_get_guint32(tvb, offset, p_mq_parm->mq_int_enc);
if (uLpiOpts == 0)
{
@@ -1784,7 +1777,7 @@ static gint dissect_mq_MQGMO(tvbuff_t *tvb, proto_tree *mq_tree, gint offset, gi
{
guint uGmoOpt;
- uGmoOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+ uGmoOpt = tvb_get_guint32(tvb, offset, p_mq_parm->mq_int_enc);
if (uGmoOpt == 0)
{
@@ -1805,7 +1798,7 @@ static gint dissect_mq_MQPMO(tvbuff_t *tvb, proto_tree *mq_tree, gint offset, gi
{
guint uPmoOpt;
- uPmoOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+ uPmoOpt = tvb_get_guint32(tvb, offset, p_mq_parm->mq_int_enc);
if (uPmoOpt == 0)
{
@@ -1826,7 +1819,7 @@ static gint dissect_mq_MQOO(tvbuff_t *tvb, proto_tree *mq_tree, gint offset, gin
{
guint uOpenOpt;
- uOpenOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+ uOpenOpt = tvb_get_guint32(tvb, offset, p_mq_parm->mq_int_enc);
if (uOpenOpt == 0)
{
@@ -1846,7 +1839,7 @@ static gint dissect_mq_MQCO(tvbuff_t *tvb, proto_tree *mq_tree, gint offset, mq_
{
guint iCloseOpt;
- iCloseOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+ iCloseOpt = tvb_get_guint32(tvb, offset, p_mq_parm->mq_int_enc);
if (iCloseOpt == 0)
{
@@ -1870,9 +1863,9 @@ static gint dissect_mq_charv(tvbuff_t *tvb, proto_tree *tree, gint offset, gint
gint32 eStr;
const char *sStr;
- lStr = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
- oStr = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
- eStr = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
+ lStr = tvb_get_guint32(tvb, offset + 12, p_mq_parm->mq_int_enc);
+ oStr = tvb_get_guint32(tvb, offset + 4, p_mq_parm->mq_int_enc);
+ eStr = tvb_get_guint32(tvb, offset + 16, p_mq_parm->mq_int_enc);
if (lStr && oStr)
{
sStr = (const char *)tvb_get_string_enc(wmem_packet_scope(), tvb, oStr, lStr, p_mq_parm->mq_str_enc);
@@ -2004,7 +1997,7 @@ static gint dissect_mq_gmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (p_mq_parm->mq_strucID == MQ_STRUCTID_GMO || p_mq_parm->mq_strucID == MQ_STRUCTID_GMO_EBCDIC)
{
guint32 iVersion = 0;
- iVersion = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
+ iVersion = tvb_get_guint32(tvb, offset + 4, p_mq_parm->mq_int_enc);
/* Compute length according to version */
switch (iVersion)
{
@@ -2068,7 +2061,7 @@ static gint dissect_mq_pmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (p_mq_parm->mq_strucID == MQ_STRUCTID_PMO || p_mq_parm->mq_strucID == MQ_STRUCTID_PMO_EBCDIC)
{
guint32 iVersion = 0;
- iVersion = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
+ iVersion = tvb_get_guint32(tvb, offset + 4, p_mq_parm->mq_int_enc);
/* Compute length according to version */
switch (iVersion)
{
@@ -2119,8 +2112,8 @@ static gint dissect_mq_pmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
gint iNbrRecords = 0;
guint32 iRecFlags = 0;
- iNbrRecords = tvb_get_guint32_endian(tvb, offset + 128, p_mq_parm->mq_int_enc);
- iRecFlags = tvb_get_guint32_endian(tvb, offset + 132, p_mq_parm->mq_int_enc);
+ iNbrRecords = tvb_get_guint32(tvb, offset + 128, p_mq_parm->mq_int_enc);
+ iRecFlags = tvb_get_guint32(tvb, offset + 132, p_mq_parm->mq_int_enc);
if (iNbrRecords > 0)
{
@@ -2128,8 +2121,8 @@ static gint dissect_mq_pmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
gint iOffsetRR = 0;
*iDistributionListSize = iNbrRecords;
- iOffsetPMR = tvb_get_guint32_endian(tvb, offset + 136, p_mq_parm->mq_int_enc);
- iOffsetRR = tvb_get_guint32_endian(tvb, offset + 140, p_mq_parm->mq_int_enc);
+ iOffsetPMR = tvb_get_guint32(tvb, offset + 136, p_mq_parm->mq_int_enc);
+ iOffsetRR = tvb_get_guint32(tvb, offset + 140, p_mq_parm->mq_int_enc);
iSize += dissect_mq_pmr(tvb, tree, offset + iSize, iNbrRecords, iOffsetPMR, iRecFlags, p_mq_parm);
iSize += dissect_mq_rr(tvb, tree, offset + iSize, iNbrRecords, iOffsetRR, p_mq_parm);
}
@@ -2148,7 +2141,7 @@ static gint dissect_mq_od(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g
{
/* The OD struct can be present in several messages at different levels */
guint32 iVersion = 0;
- iVersion = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
+ iVersion = tvb_get_guint32(tvb, offset + 4, p_mq_parm->mq_int_enc);
/* Compute length according to version */
switch (iVersion)
{
@@ -2165,9 +2158,9 @@ static gint dissect_mq_od(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g
guint32 uTyp;
if (iVersion >= 2)
- iNbrRecords = tvb_get_guint32_endian(tvb, offset + 168, p_mq_parm->mq_int_enc);
+ iNbrRecords = tvb_get_guint32(tvb, offset + 168, p_mq_parm->mq_int_enc);
- uTyp = tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
+ uTyp = tvb_get_guint32(tvb, offset + 8, p_mq_parm->mq_int_enc);
sObj = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 12, 48, p_mq_parm->mq_str_enc);
col_append_fstr(pinfo->cinfo, COL_INFO, " Typ=%s", try_val_to_str_ext(uTyp, GET_VALS_EXTP(objtype)));
if (strip_trailing_blanks(sObj, 48) > 0)
@@ -2220,8 +2213,8 @@ static gint dissect_mq_od(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g
gint iOffsetRR = 0;
*iDistributionListSize = iNbrRecords;
- iOffsetOR = tvb_get_guint32_endian(tvb, offset + 184, p_mq_parm->mq_int_enc);
- iOffsetRR = tvb_get_guint32_endian(tvb, offset + 188, p_mq_parm->mq_int_enc);
+ iOffsetOR = tvb_get_guint32(tvb, offset + 184, p_mq_parm->mq_int_enc);
+ iOffsetRR = tvb_get_guint32(tvb, offset + 188, p_mq_parm->mq_int_enc);
iSize += dissect_mq_or(tvb, tree, offset, iNbrRecords, iOffsetOR, p_mq_parm);
iSize += dissect_mq_rr(tvb, tree, offset, iNbrRecords, iOffsetRR, p_mq_parm);
@@ -2330,7 +2323,7 @@ static gint dissect_mq_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mqroot_
{
col_append_fstr(pinfo->cinfo, COL_INFO, ", QM=%s", sQMgr);
}
- p_mq_parm->mq_id_ccsid.ccsid = (guint32)tvb_get_guint16_endian(tvb, offset + 46, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_id_ccsid.ccsid = (guint32)tvb_get_guint16(tvb, offset + 46, p_mq_parm->mq_int_enc);
}
if (mqroot_tree)
{
@@ -2399,7 +2392,7 @@ static gint dissect_mq_md(tvbuff_t *tvb, proto_tree *tree, gint offset, mq_parm_
if (p_mq_parm->mq_strucID == MQ_STRUCTID_MD || p_mq_parm->mq_strucID == MQ_STRUCTID_MD_EBCDIC)
{
guint32 iVersion = 0;
- iVersion = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
+ iVersion = tvb_get_guint32(tvb, offset + 4, p_mq_parm->mq_int_enc);
/* Compute length according to version */
switch (iVersion)
{
@@ -2413,8 +2406,8 @@ static gint dissect_mq_md(tvbuff_t *tvb, proto_tree *tree, gint offset, mq_parm_
p_mq_parm->iOfsCcs = offset + 28;
p_mq_parm->iOfsFmt = offset + 32;
- p_mq_parm->mq_md_ccsid.encod = tvb_get_guint32_endian(tvb, offset + 24, p_mq_parm->mq_int_enc);
- p_mq_parm->mq_md_ccsid.ccsid = tvb_get_guint32_endian(tvb, offset + 28, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_md_ccsid.encod = tvb_get_guint32(tvb, offset + 24, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_md_ccsid.ccsid = tvb_get_guint32(tvb, offset + 28, p_mq_parm->mq_int_enc);
if (tree)
{
proto_tree *mq_tree = proto_tree_add_subtree(tree, tvb, offset, iSize, ett_mq_md, NULL, MQ_TEXT_MD);
@@ -2464,7 +2457,7 @@ static gint dissect_mq_fopa(tvbuff_t *tvb, proto_tree *tree, gint offset, mq_par
p_mq_parm->mq_strucID = (tvb_reported_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
if (p_mq_parm->mq_strucID == MQ_STRUCTID_FOPA || p_mq_parm->mq_strucID == MQ_STRUCTID_FOPA_EBCDIC)
{
- iSize = tvb_get_guint32_endian(tvb, offset+8, p_mq_parm->mq_int_enc);
+ iSize = tvb_get_guint32(tvb, offset+8, p_mq_parm->mq_int_enc);
if (iSize != 0 && tvb_reported_length_remaining(tvb, offset) >= iSize)
{
if (tree)
@@ -2520,9 +2513,9 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
(p_mq_parm->mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx_EBCDIC)
&& tvb_reported_length_remaining(tvb, offset) >= 28)
{
- proto_tree *mq_tree = NULL;
+ proto_tree *mq_tree = NULL;
proto_tree *mqroot_tree = NULL;
- proto_item *ti = NULL;
+ proto_item *ti = NULL;
/* An MQ packet always starts with this structure*/
gint iSizeTSH = 28;
@@ -2557,8 +2550,8 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
p_mq_parm->mq_ctlf1 = tvb_get_guint8(tvb, offset + iSizeMPF + 10);
p_mq_parm->mq_ctlf2 = tvb_get_guint8(tvb, offset + iSizeMPF + 11);
- p_mq_parm->mq_tsh_ccsid.encod = tvb_get_guint32_endian(tvb, offset + iSizeMPF + 20, p_mq_parm->mq_int_enc);
- p_mq_parm->mq_tsh_ccsid.ccsid = tvb_get_guint16_endian(tvb, offset + iSizeMPF + 24, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_tsh_ccsid.encod = tvb_get_guint32(tvb, offset + iSizeMPF + 20, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_tsh_ccsid.ccsid = tvb_get_guint16(tvb, offset + iSizeMPF + 24, p_mq_parm->mq_int_enc);
if (p_mq_parm->mq_tsh_ccsid.ccsid == 500 && !bEBCDIC)
{
@@ -2624,8 +2617,8 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
guint32 iReturnCode = 0;
guint32 iHdl = 0;
- iReturnCode = tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
- iHdl = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
+ iReturnCode = tvb_get_guint32(tvb, offset + 8, p_mq_parm->mq_int_enc);
+ iHdl = tvb_get_guint32(tvb, offset + 12, p_mq_parm->mq_int_enc);
dissect_mq_addCR_colinfo(pinfo, p_mq_parm);
if (iHdl != 0 && iHdl != 0xffffffff)
col_append_fstr(pinfo->cinfo, COL_INFO, " Hdl=0x%04x", iHdl);
@@ -2648,7 +2641,7 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if ((p_mq_parm->mq_strucID == MQ_STRUCTID_MSH || p_mq_parm->mq_strucID == MQ_STRUCTID_MSH_EBCDIC) && capLen >= 20)
{
gint iSize = 20;
- iSizePayload = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
+ iSizePayload = tvb_get_guint32(tvb, offset + 16, p_mq_parm->mq_int_enc);
bPayload = TRUE;
if (tree)
{
@@ -2668,8 +2661,8 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
gint iUsr = 0;
gint iPsw = 0;
- iUsr = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
- iPsw = tvb_get_guint32_endian(tvb, offset + 20, p_mq_parm->mq_int_enc);
+ iUsr = tvb_get_guint32(tvb, offset + 16, p_mq_parm->mq_int_enc);
+ iPsw = tvb_get_guint32(tvb, offset + 20, p_mq_parm->mq_int_enc);
if (tree)
{
@@ -2697,12 +2690,12 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
gint iP1;
gint iP2;
- p_mq_parm->mq_convID = tvb_get_guint32_endian(tvb, offset , p_mq_parm->mq_int_enc);
- p_mq_parm->mq_rqstID = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_convID = tvb_get_guint32(tvb, offset , p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_rqstID = tvb_get_guint32(tvb, offset + 4, p_mq_parm->mq_int_enc);
dissect_mq_addCR_colinfo(pinfo, p_mq_parm);
- iTy = tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
- iP1 = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
- iP2 = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
+ iTy = tvb_get_guint32(tvb, offset + 8, p_mq_parm->mq_int_enc);
+ iP1 = tvb_get_guint32(tvb, offset + 12, p_mq_parm->mq_int_enc);
+ iP2 = tvb_get_guint32(tvb, offset + 16, p_mq_parm->mq_int_enc);
col_append_fstr(pinfo->cinfo, COL_INFO, " Type=%d, P1=%d, P2=%d", iTy, iP1, iP2);
if (tree)
{
@@ -2723,8 +2716,8 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
gint iStatus = 0;
gint iStatusLength = 0;
- iStatus = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
- iStatusLength = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+ iStatus = tvb_get_guint32(tvb, offset + 4, p_mq_parm->mq_int_enc);
+ iStatusLength = tvb_get_guint32(tvb, offset, p_mq_parm->mq_int_enc);
if (tvb_reported_length_remaining(tvb, offset) >= iStatusLength)
{
@@ -2789,7 +2782,6 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
else if ((p_mq_parm->mq_opcode == MQ_TST_MQCONN || p_mq_parm->mq_opcode == MQ_TST_MQCONN_REPLY) && capLen > 0)
{
gint iSizeCONN = 0;
- gint nofs;
/*iSizeCONN = ((iVersionID == 4 || iVersionID == 6) ? 120 : 112);*/ /* guess */
/* The iVersionID is available in the previous ID segment, we should keep a state
@@ -2803,57 +2795,112 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
gchar *sApplicationName;
gchar *sQMgr;
- sApplicationName = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 48, 28, p_mq_parm->mq_str_enc), 28, '.');
+ guint32 iEnc;
+ guint32 iCod;
+ guint32 iApp;
+ gchar cChr;
+
+ /*
+ We have to handle the ccsid/coding of the MQCONN REPLY
+ on z/OS it is always EBCDIC
+ integer are always BIG_ENDIAN
+ */
+ if (p_mq_parm->mq_opcode == MQ_TST_MQCONN_REPLY)
+ {
+ guint32 *pApp = (guint32 *)tvb_get_ptr(tvb, offset + 48 + 28, 4);
+ if (*pApp <= 65536)
+ iCod = ENC_LITTLE_ENDIAN;
+ else
+ iCod = ENC_BIG_ENDIAN;
+ cChr = tvb_get_guint8(tvb, offset + 48);
+ if (cChr >='A' && cChr <='Z')
+ {
+ iEnc = p_mq_parm->mq_str_enc;
+ }
+ else
+ {
+ iEnc = ENC_EBCDIC;
+ }
+ }
+ else
+ {
+ iCod = p_mq_parm->mq_int_enc;
+ iEnc = p_mq_parm->mq_str_enc;
+ }
+ iApp = tvb_get_guint32(tvb, offset + 48 + 28, iCod);
+
+ sApplicationName = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 48, 28, iEnc), 28, '.');
if (strip_trailing_blanks((guint8 *)sApplicationName, 28) > 0)
{
col_append_fstr(pinfo->cinfo, COL_INFO, " App=%s", sApplicationName);
}
- sQMgr = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 48, p_mq_parm->mq_str_enc), 48, '.');
+ sQMgr = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 48, iEnc), 48, '.');
if (strip_trailing_blanks((guint8 *)sQMgr, 48) > 0)
{
col_append_fstr(pinfo->cinfo, COL_INFO, " QM=%s", sQMgr);
}
-#define do_proto_add_item(a, b) b; nofs += a;
- nofs = offset;
if (tree)
{
+ ptvcursor_t *cursor;
mq_tree = proto_tree_add_subtree(mqroot_tree, tvb, offset, iSizeCONN, ett_mq_conn, NULL, MQ_TEXT_CONN);
- do_proto_add_item(48, proto_tree_add_item(mq_tree, hf_mq_conn_QMgr , tvb, nofs, 48, p_mq_parm->mq_str_enc));
- do_proto_add_item(28, proto_tree_add_item(mq_tree, hf_mq_conn_appname , tvb, nofs, 28, p_mq_parm->mq_str_enc));
- do_proto_add_item( 4, proto_tree_add_item(mq_tree, hf_mq_conn_apptype , tvb, nofs, 4, p_mq_parm->mq_int_enc));
- do_proto_add_item(32, proto_tree_add_item(mq_tree, hf_mq_conn_acttoken, tvb, nofs, 32, ENC_NA));
+ cursor = ptvcursor_new(mq_tree, tvb, offset);
+
+ ptvcursor_add(cursor, hf_mq_conn_QMgr, 48, iEnc);
+ ptvcursor_add(cursor, hf_mq_conn_appname, 28, iEnc);
+ ptvcursor_add(cursor, hf_mq_conn_apptype, 4, iCod);
+ ptvcursor_add(cursor, hf_mq_conn_acttoken, 32, ENC_NA);
if (iSizeCONN >= 120)
{
- do_proto_add_item(4, proto_tree_add_item(mq_tree, hf_mq_conn_version, tvb, nofs, 4, p_mq_parm->mq_int_enc));
- do_proto_add_item(4, proto_tree_add_item(mq_tree, hf_mq_conn_options, tvb, nofs, 4, p_mq_parm->mq_int_enc));
+ ptvcursor_add(cursor, hf_mq_conn_version, 4, iCod);
+ ptvcursor_add(cursor, hf_mq_conn_options, 4, iCod);
}
if (iSizeCONN >= 260)
{
proto_tree *mq_tree_sub;
+ gint iVersion = 0;
+ gint nofs = ptvcursor_current_offset(cursor);
+ iVersion = tvb_get_guint32(tvb, nofs + 4, iCod);
mq_tree_sub = proto_tree_add_subtree(mq_tree, tvb, nofs, iSizeCONN - nofs, ett_mq_fcno, NULL, MQ_TEXT_FCNO);
- do_proto_add_item( 4, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_StructID , tvb, nofs, 4, p_mq_parm->mq_str_enc));
- do_proto_add_item( 4, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_unknown00, tvb, nofs, 4, p_mq_parm->mq_int_enc));
- do_proto_add_item( 4, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_unknown01, tvb, nofs, 4, p_mq_parm->mq_int_enc));
+ ptvcursor_set_tree(cursor, mq_tree_sub);
- if (iSizeCONN == 260)
+ ptvcursor_add(cursor, hf_mq_fcno_StructID, 4, iEnc);
+ ptvcursor_add(cursor, hf_mq_fcno_version, 4, iCod);
+ ptvcursor_add(cursor, hf_mq_fcno_option, 4, iCod);
+ if (iVersion == 2)
{
- do_proto_add_item( 12, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_msgid , tvb, nofs, 12, p_mq_parm->mq_str_enc));
- do_proto_add_item( 48, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_mqmid , tvb, nofs, 48, p_mq_parm->mq_str_enc));
- do_proto_add_item( 68, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_unknown02, tvb, nofs, 68, ENC_NA));
+ ptvcursor_add(cursor, hf_mq_fcno_msgid, 12, iEnc);
+ ptvcursor_add(cursor, hf_mq_fcno_mqmid, 48, iEnc);
+ ptvcursor_add(cursor, hf_mq_fcno_unknown02, 68, ENC_NA);
}
+ if (iVersion == 1)
+ {
+ if (iApp == MQ_MQAT_JAVA)
+ {
+ ptvcursor_add(cursor, hf_mq_fcno_msgid, 12, iEnc);
+ ptvcursor_add(cursor, hf_mq_fcno_mqmid, 48, iEnc);
+ ptvcursor_add(cursor, hf_mq_fcno_unknown02, 68, ENC_NA);
+ }
+ else
+ {
+ ptvcursor_add(cursor, hf_mq_fcno_connid, 24, iEnc);
+ ptvcursor_add(cursor, hf_mq_fcno_unknown02, 116, ENC_NA);
+ ptvcursor_add(cursor, hf_mq_fcno_msgid, 12, iEnc);
+ ptvcursor_add(cursor, hf_mq_fcno_mqmid, 48, iEnc);
+ }
+ }
+
if (iSizeCONN >= 332)
{
- do_proto_add_item(152, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_msgid , tvb, nofs, 152, p_mq_parm->mq_str_enc));
- proto_tree_add_item(mq_tree_sub, hf_mq_fcno_mqmid , tvb, nofs, 48, p_mq_parm->mq_int_enc);
+ dissect_mqpcf_parm(tvb, pinfo, mq_tree_sub, ptvcursor_current_offset(cursor), (guint32)-1, iCod, TRUE);
}
}
+ ptvcursor_free(cursor);
}
-#undef do_proto_add_item
offset += iSizeCONN;
}
}
@@ -2866,9 +2913,9 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
gint iOffsetINQ;
gint iSelector;
- iNbSelectors = tvb_get_guint32_endian(tvb, offset , p_mq_parm->mq_int_enc);
- iNbIntegers = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
- iCharLen = tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
+ iNbSelectors = tvb_get_guint32(tvb, offset , p_mq_parm->mq_int_enc);
+ iNbIntegers = tvb_get_guint32(tvb, offset + 4, p_mq_parm->mq_int_enc);
+ iCharLen = tvb_get_guint32(tvb, offset + 8, p_mq_parm->mq_int_enc);
if (tree)
{
@@ -2921,8 +2968,8 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint uHdl;
guint uCod;
- uHdl = tvb_get_guint32_endian(tvb, offset+4, p_mq_parm->mq_int_enc);
- uCod = tvb_get_guint32_endian(tvb, offset+8, p_mq_parm->mq_int_enc);
+ uHdl = tvb_get_guint32(tvb, offset+4, p_mq_parm->mq_int_enc);
+ uCod = tvb_get_guint32(tvb, offset+8, p_mq_parm->mq_int_enc);
dissect_mq_addCR_colinfo(pinfo, p_mq_parm);
col_append_fstr(pinfo->cinfo, COL_INFO, " Hdl=0x%04x Cod=%s(0x%x)",
@@ -2932,10 +2979,10 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
mq_tree = proto_tree_add_subtree(mqroot_tree, tvb, offset, -1, ett_mq_notif, NULL, MQ_TEXT_NOTIFICATION);
- proto_tree_add_item(mq_tree, hf_mq_notif_vers, tvb, offset, 4, p_mq_parm->mq_int_enc);
+ proto_tree_add_item(mq_tree, hf_mq_notif_vers, tvb, offset, 4, p_mq_parm->mq_int_enc);
proto_tree_add_item(mq_tree, hf_mq_notif_handle, tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
- proto_tree_add_item(mq_tree, hf_mq_notif_code, tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
- proto_tree_add_item(mq_tree, hf_mq_notif_value, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+ proto_tree_add_item(mq_tree, hf_mq_notif_code, tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
+ proto_tree_add_item(mq_tree, hf_mq_notif_value, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
}
offset+=16;
p_mq_parm->mq_strucID = (tvb_reported_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
@@ -2950,14 +2997,14 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
gint iOpt;
xOfs = 0;
- iHdl = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
- iMaxMsgLen = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
- iFlags = tvb_get_guint32_endian(tvb, offset + 32, p_mq_parm->mq_int_enc);
- iGlbMsgIdx = tvb_get_guint32_endian(tvb, offset + 36, p_mq_parm->mq_int_enc);
+ iHdl = tvb_get_guint32(tvb, offset + 4, p_mq_parm->mq_int_enc);
+ iMaxMsgLen = tvb_get_guint32(tvb, offset + 16, p_mq_parm->mq_int_enc);
+ iFlags = tvb_get_guint32(tvb, offset + 32, p_mq_parm->mq_int_enc);
+ iGlbMsgIdx = tvb_get_guint32(tvb, offset + 36, p_mq_parm->mq_int_enc);
if (iFlags & 0x00000010)
{
- p_mq_parm->mq_msgreq_ccsid.encod = tvb_get_guint32_endian(tvb, offset + 44, p_mq_parm->mq_int_enc);
- p_mq_parm->mq_msgreq_ccsid.ccsid = tvb_get_guint32_endian(tvb, offset + 48, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_msgreq_ccsid.encod = tvb_get_guint32(tvb, offset + 44, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_msgreq_ccsid.ccsid = tvb_get_guint32(tvb, offset + 48, p_mq_parm->mq_int_enc);
}
dissect_mq_addCR_colinfo(pinfo, p_mq_parm);
col_append_fstr(pinfo->cinfo, COL_INFO, " Hdl=0x%04x GlbMsgIdx=%d, MaxLen=%d",
@@ -2988,7 +3035,7 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(mq_tree, hf_mq_msgreq_MsgSeqNum, tvb, offset + 52, 4, p_mq_parm->mq_int_enc);
proto_tree_add_item(mq_tree, hf_mq_msgreq_offset , tvb, offset + 56, 4, p_mq_parm->mq_int_enc);
dissect_mq_MQMO(tvb, mq_tree, offset + 60, ett_mq_gmo_matchoption, p_mq_parm);
- iOpt = tvb_get_guint32_endian(tvb, offset + 60, p_mq_parm->mq_int_enc);
+ iOpt = tvb_get_guint32(tvb, offset + 60, p_mq_parm->mq_int_enc);
if (iOpt & MQ_MQMO_MATCH_MSG_ID)
{
@@ -3025,10 +3072,10 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
gint iHdl;
gint iHdrL;
- iHdl = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
- iGlbMsgIdx = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
- iSegLength = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
- iSegmIndex = tvb_get_guint16_endian(tvb, offset + 20, p_mq_parm->mq_int_enc);
+ iHdl = tvb_get_guint32(tvb, offset + 4, p_mq_parm->mq_int_enc);
+ iGlbMsgIdx = tvb_get_guint32(tvb, offset + 12, p_mq_parm->mq_int_enc);
+ iSegLength = tvb_get_guint32(tvb, offset + 16, p_mq_parm->mq_int_enc);
+ iSegmIndex = tvb_get_guint16(tvb, offset + 20, p_mq_parm->mq_int_enc);
if (iSegmIndex == 0)
{
@@ -3090,7 +3137,7 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
p_mq_parm->iOfsCcs = offset + 16;
p_mq_parm->iOfsFmt = offset + 20;
- iSpiVerb = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+ iSpiVerb = tvb_get_guint32(tvb, offset, p_mq_parm->mq_int_enc);
col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", val_to_str(iSpiVerb, mq_spi_verbs_vals, "Unknown (0x%08x)"));
if (tree)
@@ -3157,7 +3204,7 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
gint iVerbNumber = 0;
proto_tree_add_item(mq_tree, hf_mq_spi_spqo_nbverb, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
- iVerbNumber = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
+ iVerbNumber = tvb_get_guint32(tvb, offset + 12, p_mq_parm->mq_int_enc);
if (tvb_reported_length_remaining(tvb, offset) >= iVerbNumber * 20 + 16)
{
@@ -3208,7 +3255,7 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_bitmask(mq_tree, tvb, offset + 12, hf_mq_spi_spgo_options, ett_mq_spi_options, pf_flds_spiopt, ENC_BIG_ENDIAN);
proto_tree_add_item(mq_tree, hf_mq_spi_spgo_size, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
}
- iSizePayload = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
+ iSizePayload = tvb_get_guint32(tvb, offset + 16, p_mq_parm->mq_int_enc);
offset += 20;
bPayload = TRUE;
}
@@ -3265,7 +3312,7 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
&& tvb_reported_length_remaining(tvb, offset) >= 4)
{
gint iNbXid = 0;
- iNbXid = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+ iNbXid = tvb_get_guint32(tvb, offset, p_mq_parm->mq_int_enc);
if (tree)
{
proto_tree_add_item(mq_tree, hf_mq_xa_count, tvb, offset, 4, p_mq_parm->mq_int_enc);
@@ -3290,11 +3337,11 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint iVersion;
guint iXtraData = 0;
gint iSize = 32;
- iVersion = tvb_get_guint32_endian(tvb, offset+4, p_mq_parm->mq_int_enc);
+ iVersion = tvb_get_guint32(tvb, offset+4, p_mq_parm->mq_int_enc);
if (iVersion >= 3)
{
iSize += 56;
- iXtraData = tvb_get_guint32_endian(tvb, offset + 84, p_mq_parm->mq_int_enc);
+ iXtraData = tvb_get_guint32(tvb, offset + 84, p_mq_parm->mq_int_enc);
}
if (iSize != 0 && tvb_reported_length_remaining(tvb, offset) >= iSize)
@@ -3402,7 +3449,7 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
if (bPayload == TRUE && (p_mq_parm->mq_opcode != MQ_TST_ASYNC_MESSAGE))
{
- iSizePayload = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+ iSizePayload = tvb_get_guint32(tvb, offset, p_mq_parm->mq_int_enc);
if (tree)
{
mq_tree = proto_tree_add_subtree(mqroot_tree, tvb, offset, 4, ett_mq_put, NULL, MQ_TEXT_PUT);
@@ -3461,8 +3508,8 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
p_mq_parm->iOfsCcs = offset + 112;
p_mq_parm->iOfsFmt = offset + 116;
- p_mq_parm->mq_dlh_ccsid.encod = tvb_get_guint32_endian(tvb, offset + 108, p_mq_parm->mq_int_enc);
- p_mq_parm->mq_dlh_ccsid.ccsid = tvb_get_guint32_endian(tvb, offset + 112, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_dlh_ccsid.encod = tvb_get_guint32(tvb, offset + 108, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_dlh_ccsid.ccsid = tvb_get_guint32(tvb, offset + 112, p_mq_parm->mq_int_enc);
if (tree)
{
@@ -3496,14 +3543,14 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Dissect the generic part of the other pre-defined headers */
/* We assume that only one such header is present */
gint iSizeHeader;
- iSizeHeader = (gint) tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
+ iSizeHeader = (gint) tvb_get_guint32(tvb, offset + 8, p_mq_parm->mq_int_enc);
/* XXX - 32 is inferred from the code below. What's the
* correct minimum? */
if (iSizeHeader <= 32)
THROW(ReportedBoundsError);
- p_mq_parm->mq_head_ccsid.encod = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
- p_mq_parm->mq_head_ccsid.ccsid = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_head_ccsid.encod = tvb_get_guint32(tvb, offset + 12, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_head_ccsid.ccsid = tvb_get_guint32(tvb, offset + 16, p_mq_parm->mq_int_enc);
if (tvb_reported_length_remaining(tvb, offset) >= iSizeHeader)
{
@@ -3516,8 +3563,8 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
p_mq_parm->iOfsCcs = offset + 16;
p_mq_parm->iOfsFmt = offset + 20;
- iVer = (gint)tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
- iLen = (gint)tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
+ iVer = (gint)tvb_get_guint32(tvb, offset + 4, p_mq_parm->mq_int_enc);
+ iLen = (gint)tvb_get_guint32(tvb, offset + 8, p_mq_parm->mq_int_enc);
iTmp = p_mq_parm->mq_head_ccsid.ccsid;
if (iTmp == 0)
iTmp = p_mq_parm->mq_md_ccsid.ccsid;
@@ -3542,7 +3589,7 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (p_mq_parm->mq_strucID == MQ_STRUCTID_DH || p_mq_parm->mq_strucID == MQ_STRUCTID_DH_EBCDIC)
{
gint iRec;
- iRec = tvb_get_guint32_endian(tvb, offset + 36, p_mq_parm->mq_int_enc);
+ iRec = tvb_get_guint32(tvb, offset + 36, p_mq_parm->mq_int_enc);
proto_tree_add_bitmask(mq_tree, tvb, offset + 28, hf_mq_head_flags, ett_mq_head_flags, pf_flds_dh_flags, ENC_BIG_ENDIAN);
proto_tree_add_item(mq_tree, hf_mq_dh_putmsgrecfld, tvb, offset + 32, 4, p_mq_parm->mq_int_enc);
@@ -3557,9 +3604,9 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
gint iFlgs;
gint iSize;
- iFlgs = (gint)tvb_get_guint32_endian(tvb, offset + 32, p_mq_parm->mq_int_enc);
- iOfs1 = (gint)tvb_get_guint32_endian(tvb, offset + 40, p_mq_parm->mq_int_enc);
- iOfs2 = (gint)tvb_get_guint32_endian(tvb, offset + 44, p_mq_parm->mq_int_enc);
+ iFlgs = (gint)tvb_get_guint32(tvb, offset + 32, p_mq_parm->mq_int_enc);
+ iOfs1 = (gint)tvb_get_guint32(tvb, offset + 40, p_mq_parm->mq_int_enc);
+ iOfs2 = (gint)tvb_get_guint32(tvb, offset + 44, p_mq_parm->mq_int_enc);
iSize = dissect_mq_or(tvb, mq_tree, offset + 48, iRec, iOfs1, p_mq_parm);
/*iSize = */dissect_mq_pmr(tvb, mqroot_tree, offset + 48 + iSize, iRec, iOfs2, iFlgs, p_mq_parm);
@@ -3663,7 +3710,7 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
iEnd = offset + iLen - 32;
if ( iVer > 1 )
{
- iCCSID = (int)tvb_get_guint32_endian(tvb, iPos, p_mq_parm->mq_int_enc);
+ iCCSID = (int)tvb_get_guint32(tvb, iPos, p_mq_parm->mq_int_enc);
proto_tree_add_item(mq_tree, hf_mq_rfh_ccsid, tvb, iPos, 4, p_mq_parm->mq_int_enc);
iPos += 4;
iEnd -= 4;
@@ -3673,7 +3720,7 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
while (iPos < iEnd)
{
- iLenStr = (int)tvb_get_guint32_endian(tvb, iPos, p_mq_parm->mq_int_enc);
+ iLenStr = (int)tvb_get_guint32(tvb, iPos, p_mq_parm->mq_int_enc);
sStr = tvb_get_string_enc(wmem_packet_scope(), tvb, iPos + 4, iLenStr, (iCCSID != 500) ? ENC_ASCII : ENC_EBCDIC);
if (*sStr)
strip_trailing_blanks(sStr, iLenStr);
@@ -3707,8 +3754,8 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
/* Call subdissector for the payload */
tvbuff_t *next_tvb;
- p_mq_parm->mq_cur_ccsid.encod = tvb_get_guint32_endian(tvb, p_mq_parm->iOfsEnc, p_mq_parm->mq_int_enc);
- p_mq_parm->mq_cur_ccsid.ccsid = tvb_get_guint32_endian(tvb, p_mq_parm->iOfsCcs, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_cur_ccsid.encod = tvb_get_guint32(tvb, p_mq_parm->iOfsEnc, p_mq_parm->mq_int_enc);
+ p_mq_parm->mq_cur_ccsid.ccsid = tvb_get_guint32(tvb, p_mq_parm->iOfsCcs, p_mq_parm->mq_int_enc);
memcpy(p_mq_parm->mq_format,
tvb_get_string_enc(wmem_packet_scope(), tvb, p_mq_parm->iOfsFmt, sizeof(p_mq_parm->mq_format), p_mq_parm->mq_str_enc),
sizeof(p_mq_parm->mq_format));
@@ -3861,13 +3908,13 @@ static int reassemble_mq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
iHdrL = 28 + iMulS;
/* Get the MQ Handle of the Object */
- iHdl = tvb_get_guint32_endian(tvb, iHdrL + 4, iEnco);
+ iHdl = tvb_get_guint32(tvb, iHdrL + 4, iEnco);
/* Get the Global Message Index */
- iGlbMsgIdx = tvb_get_guint32_endian(tvb, iHdrL + 12, iEnco);
+ iGlbMsgIdx = tvb_get_guint32(tvb, iHdrL + 12, iEnco);
/* Get the Segment Length */
- iSegLength = tvb_get_guint32_endian(tvb, iHdrL + 16, iEnco);
+ iSegLength = tvb_get_guint32(tvb, iHdrL + 16, iEnco);
/* Get the Segment Index */
- iSegmIndex = tvb_get_guint16_endian(tvb, iHdrL +20, iEnco);
+ iSegmIndex = tvb_get_guint16(tvb, iHdrL +20, iEnco);
/*
if SegmIndex == 0, it has 54 bytes + the length and padding
@@ -4211,8 +4258,9 @@ void proto_register_mq(void)
{ &hf_mq_conn_options , {"Options.", "mq.conn.options", FT_UINT32, BASE_HEX, NULL, 0x0, "CONN options", HFILL }},
{ &hf_mq_fcno_StructID , {"StructId.", "mq.fcno.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
- { &hf_mq_fcno_unknown00, {"unknown00", "mq.fcno.unknown00", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "FCNO unknown00", HFILL }},
- { &hf_mq_fcno_unknown01, {"unknown01", "mq.fcno.unknown01", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "FCNO unknown01", HFILL }},
+ { &hf_mq_fcno_version , {"version..", "mq.fcno.version", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "FCNO version", HFILL }},
+ { &hf_mq_fcno_option , {"Option...", "mq.fcno.option", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "FCNO option", HFILL }},
+ { &hf_mq_fcno_connid , {"connId...", "mq.fcno.connid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "FCNO Connection ID", HFILL }},
{ &hf_mq_fcno_unknown02, {"unknown02", "mq.fcno.unknown02", FT_BYTES, BASE_NONE, NULL, 0x0, "FCNO unknown02", HFILL }},
{ &hf_mq_fcno_msgid , {"msgid....", "mq.fcno.msgid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "FCNO Msg ID", HFILL }},
{ &hf_mq_fcno_mqmid , {"MqmId....", "mq.fcno.mqmid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "FCNO Mqm ID", HFILL }},
@@ -4771,6 +4819,7 @@ void proto_reg_handoff_mq(void)
_try_mq_vals_sort(GET_VALS_EXTP(mqat));
_try_mq_vals_sort(GET_VALS_EXTP(PrmTyp));
_try_mq_vals_sort(GET_VALS_EXTP(objtype));
+ _try_mq_vals_sort(GET_VALS_EXTP(StructID));
}
/*
diff --git a/epan/dissectors/packet-mq.h b/epan/dissectors/packet-mq.h
index 505642d322..3ad9b0bfca 100644
--- a/epan/dissectors/packet-mq.h
+++ b/epan/dissectors/packet-mq.h
@@ -29,8 +29,7 @@
#define GET_VALSV(A) mq_##A##_vals
#define GET_VALSV2(A) GET_VALSV(A)
#define DEF_VALSX(A) extern value_string GET_VALSV(A)[]
-/* XXX WTF: this is broken it's used to cast value_string array to char
-* This Macro is used to cast a value_string to a const gchar *
+/* This Macro is used to cast a value_string to a const gchar *
* Used in value_string MQCFINT_Parse, because this value_string
* don't return a string for a specific value, but a value_string
* that can be used in another call to try_val_to_str
@@ -78,6 +77,7 @@ typedef struct _mq_parm_t
guint32 mq_strucID ;
guint32 mq_int_enc ;
guint32 mq_str_enc ;
+ guint32 mq_FAPLvl ;
guint8 mq_ctlf1 ;
guint8 mq_ctlf2 ;
guint8 mq_opcode ;
@@ -111,6 +111,8 @@ typedef struct _mq_parm_t
#define MQ_MQAIT_ALL 0
#define MQ_MQAIT_CRL_LDAP 1
#define MQ_MQAIT_OCSP 2
+#define MQ_MQAIT_IDPW_OS 3
+#define MQ_MQAIT_IDPW_LDAP 4
/* Buffer To Message Handle Options */
#define MQ_MQBMHO_NONE 0x00000000
@@ -829,6 +831,7 @@ typedef struct _mq_parm_t
#define MQ_MQHC_UNASSOCIATED_HCONN (-3)
/* String Lengths */
+#define MQ_MQ_OPERATOR_MESSAGE_LENGTH 4
#define MQ_MQ_ABEND_CODE_LENGTH 4
#define MQ_MQ_ACCOUNTING_TOKEN_LENGTH 32
#define MQ_MQ_APPL_DESC_LENGTH 64
@@ -857,6 +860,7 @@ typedef struct _mq_parm_t
#define MQ_MQ_CHINIT_SERVICE_PARM_LENGTH 32
#define MQ_MQ_CICS_FILE_NAME_LENGTH 8
#define MQ_MQ_CLIENT_ID_LENGTH 23
+#define MQ_MQ_CLIENT_USER_ID_LENGTH 1024
#define MQ_MQ_CLUSTER_NAME_LENGTH 48
#define MQ_MQ_COMM_INFO_DESC_LENGTH 64
#define MQ_MQ_COMM_INFO_NAME_LENGTH 48
@@ -866,6 +870,7 @@ typedef struct _mq_parm_t
#define MQ_MQ_CORREL_ID_LENGTH 24
#define MQ_MQ_CREATION_DATE_LENGTH 12
#define MQ_MQ_CREATION_TIME_LENGTH 8
+#define MQ_MQ_CSP_PASSWORD_LENGTH 256
#define MQ_MQ_DATE_LENGTH 12
#define MQ_MQ_DISTINGUISHED_NAME_LENGTH 1024
#define MQ_MQ_DNS_GROUP_NAME_LENGTH 18
@@ -885,6 +890,9 @@ typedef struct _mq_parm_t
#define MQ_MQ_INSTALLATION_PATH_LENGTH 256
#define MQ_MQ_JAAS_CONFIG_LENGTH 1024
#define MQ_MQ_LDAP_PASSWORD_LENGTH 32
+#define MQ_MQ_LDAP_BASE_DN_LENGTH 1024
+#define MQ_MQ_LDAP_FIELD_LENGTH 128
+#define MQ_MQ_LDAP_CLASS_LENGTH 128
#define MQ_MQ_LISTENER_NAME_LENGTH 48
#define MQ_MQ_LISTENER_DESC_LENGTH 64
#define MQ_MQ_LOCAL_ADDRESS_LENGTH 48
@@ -893,12 +901,14 @@ typedef struct _mq_parm_t
#define MQ_MQ_LUWID_LENGTH 16
#define MQ_MQ_MAX_EXIT_NAME_LENGTH 128
#define MQ_MQ_MAX_MCA_USER_ID_LENGTH 64
+#define MQ_MQ_MAX_LDAP_MCA_USER_ID_LENGTH 1024
#define MQ_MQ_MAX_PROPERTY_NAME_LENGTH 4095
#define MQ_MQ_MAX_USER_ID_LENGTH 64
#define MQ_MQ_MCA_JOB_NAME_LENGTH 28
#define MQ_MQ_MCA_NAME_LENGTH 20
#define MQ_MQ_MCA_USER_DATA_LENGTH 32
#define MQ_MQ_MCA_USER_ID_LENGTH 64
+#define MQ_MQ_LDAP_MCA_USER_ID_LENGTH 1024
#define MQ_MQ_MFS_MAP_NAME_LENGTH 8
#define MQ_MQ_MODE_NAME_LENGTH 8
#define MQ_MQ_MSG_HEADER_LENGTH 4000
@@ -973,6 +983,7 @@ typedef struct _mq_parm_t
#define MQ_MQ_CHLAUTH_DESC_LENGTH 64
#define MQ_MQ_CUSTOM_LENGTH 128
#define MQ_MQ_SUITE_B_SIZE 4
+#define MQ_MQ_CERT_LABEL_LENGTH 64
/* Completion Codes */
#define MQ_MQCC_OK 0
@@ -1508,6 +1519,9 @@ typedef struct _mq_parm_t
#define MQ_MQRC_CIPHER_SPEC_NOT_SUITE_B 2591
#define MQ_MQRC_SUITE_B_ERROR 2592
#define MQ_MQRC_CERT_VAL_POLICY_ERROR 2593
+#define MQ_MQRC_PASSWORD_PROTECTION_ERROR 2594
+#define MQ_MQRC_CSP_ERROR 2595
+#define MQ_MQRC_CERT_LABEL_NOT_ALLOWED 2596
#define MQ_MQRC_REOPEN_EXCL_INPUT_ERROR 6100
#define MQ_MQRC_REOPEN_INQUIRE_ERROR 6101
#define MQ_MQRC_REOPEN_SAVED_CONTEXT_ERR 6102
@@ -1747,7 +1761,8 @@ typedef struct _mq_parm_t
#define MQ_MQCMDL_LEVEL_710 710
#define MQ_MQCMDL_LEVEL_711 711
#define MQ_MQCMDL_LEVEL_750 750
-#define MQ_MQCMDL_CURRENT_LEVEL 750
+#define MQ_MQCMDL_LEVEL_800 800
+#define MQ_MQCMDL_CURRENT_LEVEL 800
/* Command Server Options */
#define MQ_MQCSRV_CONVERT_NO 0
@@ -2101,11 +2116,13 @@ typedef struct _mq_parm_t
#define MQ_MQCA_BASE_OBJECT_NAME 2002
#define MQ_MQCA_BASE_Q_NAME 2002
#define MQ_MQCA_BATCH_INTERFACE_ID 2068
+#define MQ_MQCA_CERT_LABEL 2121
#define MQ_MQCA_CF_STRUC_DESC 2052
#define MQ_MQCA_CF_STRUC_NAME 2039
#define MQ_MQCA_CHANNEL_AUTO_DEF_EXIT 2026
#define MQ_MQCA_CHILD 2101
#define MQ_MQCA_CHINIT_SERVICE_PARM 2076
+#define MQ_MQCA_CHLAUTH_DESC 2118
#define MQ_MQCA_CICS_FILE_NAME 2060
#define MQ_MQCA_CLUSTER_DATE 2037
#define MQ_MQCA_CLUSTER_NAME 2029
@@ -2114,10 +2131,15 @@ typedef struct _mq_parm_t
#define MQ_MQCA_CLUSTER_TIME 2038
#define MQ_MQCA_CLUSTER_WORKLOAD_DATA 2034
#define MQ_MQCA_CLUSTER_WORKLOAD_EXIT 2033
+#define MQ_MQCA_CLUS_CHL_NAME 2124
#define MQ_MQCA_COMMAND_INPUT_Q_NAME 2003
#define MQ_MQCA_COMMAND_REPLY_Q_NAME 2067
+#define MQ_MQCA_COMM_INFO_DESC 2111
+#define MQ_MQCA_COMM_INFO_NAME 2110
+#define MQ_MQCA_CONN_AUTH 2125
#define MQ_MQCA_CREATION_DATE 2004
#define MQ_MQCA_CREATION_TIME 2005
+#define MQ_MQCA_CUSTOM 2119
#define MQ_MQCA_DEAD_LETTER_Q_NAME 2006
#define MQ_MQCA_DEF_XMIT_Q_NAME 2025
#define MQ_MQCA_DNS_GROUP 2071
@@ -2125,12 +2147,24 @@ typedef struct _mq_parm_t
#define MQ_MQCA_FIRST 2001
#define MQ_MQCA_IGQ_USER_ID 2041
#define MQ_MQCA_INITIATION_Q_NAME 2008
+#define MQ_MQCA_INSTALLATION_DESC 2115
+#define MQ_MQCA_INSTALLATION_NAME 2116
+#define MQ_MQCA_INSTALLATION_PATH 2117
#define MQ_MQCA_LAST 4000
+#define MQ_MQCA_LAST_USED 2135
+#define MQ_MQCA_LDAP_BASE_DN_GROUPS 2132
+#define MQ_MQCA_LDAP_BASE_DN_USERS 2126
+#define MQ_MQCA_LDAP_FIND_GROUP_FIELD 2135
+#define MQ_MQCA_LDAP_GROUP_ATTR_FIELD 2134
+#define MQ_MQCA_LDAP_GROUP_OBJECT_CLASS 2133
#define MQ_MQCA_LDAP_PASSWORD 2048
+#define MQ_MQCA_LDAP_SHORT_USER_FIELD 2127
+#define MQ_MQCA_LDAP_USER_ATTR_FIELD 2129
#define MQ_MQCA_LDAP_USER_NAME 2047
+#define MQ_MQCA_LDAP_USER_OBJECT_CLASS 2128
+#define MQ_MQCA_LU62_ARM_SUFFIX 2074
#define MQ_MQCA_LU_GROUP_NAME 2072
#define MQ_MQCA_LU_NAME 2073
-#define MQ_MQCA_LU62_ARM_SUFFIX 2074
#define MQ_MQCA_MODEL_DURABLE_Q 2096
#define MQ_MQCA_MODEL_NON_DURABLE_Q 2097
#define MQ_MQCA_MONITOR_Q_NAME 2066
@@ -2139,14 +2173,17 @@ typedef struct _mq_parm_t
#define MQ_MQCA_NAMES 2020
#define MQ_MQCA_PARENT 2102
#define MQ_MQCA_PASS_TICKET_APPL 2086
+#define MQ_MQCA_POLICY_NAME 2112
#define MQ_MQCA_PROCESS_DESC 2011
#define MQ_MQCA_PROCESS_NAME 2012
+#define MQ_MQCA_QSG_CERT_LABEL 2131
+#define MQ_MQCA_QSG_NAME 2040
#define MQ_MQCA_Q_DESC 2013
#define MQ_MQCA_Q_MGR_DESC 2014
#define MQ_MQCA_Q_MGR_IDENTIFIER 2032
#define MQ_MQCA_Q_MGR_NAME 2015
#define MQ_MQCA_Q_NAME 2016
-#define MQ_MQCA_QSG_NAME 2040
+#define MQ_MQCA_RECIPIENT_DN 2114
#define MQ_MQCA_REMOTE_Q_MGR_NAME 2017
#define MQ_MQCA_REMOTE_Q_NAME 2018
#define MQ_MQCA_REPOSITORY_NAME 2035
@@ -2159,13 +2196,15 @@ typedef struct _mq_parm_t
#define MQ_MQCA_SERVICE_START_COMMAND 2079
#define MQ_MQCA_SERVICE_STOP_ARGS 2082
#define MQ_MQCA_SERVICE_STOP_COMMAND 2081
-#define MQ_MQCA_STDERR_DESTINATION 2084
-#define MQ_MQCA_STDOUT_DESTINATION 2083
+#define MQ_MQCA_SIGNER_DN 2113
+#define MQ_MQCA_SSL_CERT_ISSUER_NAME 2130
#define MQ_MQCA_SSL_CRL_NAMELIST 2050
#define MQ_MQCA_SSL_CRYPTO_HARDWARE 2051
#define MQ_MQCA_SSL_KEY_LIBRARY 2069
#define MQ_MQCA_SSL_KEY_MEMBER 2070
#define MQ_MQCA_SSL_KEY_REPOSITORY 2049
+#define MQ_MQCA_STDERR_DESTINATION 2084
+#define MQ_MQCA_STDOUT_DESTINATION 2083
#define MQ_MQCA_STORAGE_CLASS 2022
#define MQ_MQCA_STORAGE_CLASS_DESC 2042
#define MQ_MQCA_SYSTEM_LOG_Q_NAME 2065
@@ -2186,20 +2225,9 @@ typedef struct _mq_parm_t
#define MQ_MQCA_XCF_GROUP_NAME 2043
#define MQ_MQCA_XCF_MEMBER_NAME 2044
#define MQ_MQCA_XMIT_Q_NAME 2024
-#define MQ_MQCA_COMM_INFO_NAME 2110
-#define MQ_MQCA_COMM_INFO_DESC 2111
-#define MQ_MQCA_POLICY_NAME 2112
-#define MQ_MQCA_SIGNER_DN 2113
-#define MQ_MQCA_RECIPIENT_DN 2114
-#define MQ_MQCA_INSTALLATION_DESC 2115
-#define MQ_MQCA_INSTALLATION_NAME 2116
-#define MQ_MQCA_INSTALLATION_PATH 2117
-#define MQ_MQCA_CHLAUTH_DESC 2118
-#define MQ_MQCA_CUSTOM 2119
-#define MQ_MQCA_XR_VERSION 2122
#define MQ_MQCA_XR_SSL_CIPHER_SUITES 2123
+#define MQ_MQCA_XR_VERSION 2122
#define MQ_MQCA_CLUS_CHL_NAME 2124
-#define MQ_MQCA_LAST_USED 2124
/* Integer Attribute Selectors */
#define MQ_MQIA_ACCOUNTING_CONN_OVERRIDE 136
@@ -4184,12 +4212,13 @@ typedef struct _mq_parm_t
#define MQ_MQAUTH_ALL_MQI (-3)
/* Authority Options */
-#define MQ_MQAUTHOPT_CUMULATIVE 0x00000100
#define MQ_MQAUTHOPT_ENTITY_EXPLICIT 0x00000001
#define MQ_MQAUTHOPT_ENTITY_SET 0x00000002
+#define MQ_MQAUTHOPT_NAME_EXPLICIT 0x00000010
#define MQ_MQAUTHOPT_NAME_ALL_MATCHING 0x00000020
#define MQ_MQAUTHOPT_NAME_AS_WILDCARD 0x00000040
-#define MQ_MQAUTHOPT_NAME_EXPLICIT 0x00000010
+#define MQ_MQAUTHOPT_CUMULATIVE 0x00000100
+#define MQ_MQAUTHOPT_EXCLUDE_TEMP 0x00000200
/* Bridge Types */
#define MQ_MQBT_OTMA 1
@@ -4840,10 +4869,10 @@ typedef struct _mq_parm_t
#endif
-extern guint32 tvb_get_guint32_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep);
-extern guint16 tvb_get_guint16_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep);
-extern guint64 tvb_get_guint64_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep);
-extern gint32 strip_trailing_blanks(guint8 *a_str, guint32 a_size);
+extern gint32 strip_trailing_blanks(guint8 *a_str,
+ guint32 a_size);
+extern void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq_tree,
+ guint offset, guint32 uCount, guint bLittleEndian, gboolean bParse);
DEF_VALSX(mqcc);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-27 07:54:13 +0000