Update for MQ 9.2.5

ibm-messaging · Feb 25, 2022 · 12f5f93 · 12f5f93
1 parent e16b40e
commit 12f5f93
Show file tree

Hide file tree

Showing 19 changed files with 207 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 Newest updates are at the top of this file.
 
+## Feb 25 2022 - v5.2.5
+* Update for MQ 9.2.5
+* ibmmq - Add MQI character constants for Group/Segment status
+* ibmmq - PCF parser now understands PCF Groups
+* samples - Add a PCF command creator/parser
+* mqmetric - Optional ReplyQ2 config parm as separate name (ibm-messaging/mq-metric-samples#100)
+
 ## Nov 19 2021 - v5.2.4
 * Update for MQ 9.2.4
 * ibmmq - Support for MQBNO (application balancing) structure

diff --git a/DEPRECATIONS.md b/DEPRECATIONS.md
@@ -15,6 +15,8 @@ The following interfaces are planned to be removed:
   * The replacement APIs is already available in the v5 stream.
 * InqMap - was a temporary route to replace original Inq function
   * Replacement is the current Inq function
+* The PCFParameter class will change so that instead of separate
+  int64/string etc values, there's a single {} interface object
 
 #### Package mqmetric
 * Remove direct access to xxxStatus variables.

diff --git a/Dockerfile b/Dockerfile
@@ -58,7 +58,7 @@ RUN mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg \
 # Location of the downloadable MQ client package \
 ENV RDURL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist" \
     RDTAR="IBM-MQC-Redist-LinuxX64.tar.gz" \
-    VRMF=9.2.4.0
+    VRMF=9.2.5.0
 
 # Install the MQ client from the Redistributable package. This also contains the
 # header files we need to compile against. Setup the subset of the package

diff --git a/ibmmq/cmqc_aix.go b/ibmmq/cmqc_aix.go
@@ -32,8 +32,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  11/4/21 3:44 PM
-*   Build Level:   p924-L211104
+*   Generated on:  2/7/22 6:36 PM
+*   Build Level:   p925-L220207
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1021,7 +1021,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 924
+	MQCMDL_CURRENT_LEVEL           int32  = 925
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1067,6 +1067,7 @@ const (
 	MQCMDL_LEVEL_922               int32  = 922
 	MQCMDL_LEVEL_923               int32  = 923
 	MQCMDL_LEVEL_924               int32  = 924
+	MQCMDL_LEVEL_925               int32  = 925
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -2669,6 +2670,7 @@ const (
 	MQIMMREASON_NONE               int32  = 0
 	MQIMMREASON_NOT_CLIENT         int32  = 1
 	MQIMMREASON_NOT_RECONNECTABLE  int32  = 2
+	MQIMMREASON_NO_REDIRECT        int32  = 7
 	MQIMPO_CONVERT_TYPE            int32  = 2
 	MQIMPO_CONVERT_VALUE           int32  = 32
 	MQIMPO_CURRENT_LENGTH          int32  = 64

diff --git a/ibmmq/cmqc_darwin.go b/ibmmq/cmqc_darwin.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  11/4/21 3:44 PM
-*   Build Level:   p924-L211104
+*   Generated on:  2/7/22 6:36 PM
+*   Build Level:   p925-L220207
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1019,7 +1019,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 924
+	MQCMDL_CURRENT_LEVEL           int32  = 925
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1065,6 +1065,7 @@ const (
 	MQCMDL_LEVEL_922               int32  = 922
 	MQCMDL_LEVEL_923               int32  = 923
 	MQCMDL_LEVEL_924               int32  = 924
+	MQCMDL_LEVEL_925               int32  = 925
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -2667,6 +2668,7 @@ const (
 	MQIMMREASON_NONE               int32  = 0
 	MQIMMREASON_NOT_CLIENT         int32  = 1
 	MQIMMREASON_NOT_RECONNECTABLE  int32  = 2
+	MQIMMREASON_NO_REDIRECT        int32  = 7
 	MQIMPO_CONVERT_TYPE            int32  = 2
 	MQIMPO_CONVERT_VALUE           int32  = 32
 	MQIMPO_CURRENT_LENGTH          int32  = 64

diff --git a/ibmmq/cmqc_linux_amd64.go b/ibmmq/cmqc_linux_amd64.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  11/4/21 3:44 PM
-*   Build Level:   p924-L211104
+*   Generated on:  2/7/22 6:36 PM
+*   Build Level:   p925-L220207
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1019,7 +1019,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 924
+	MQCMDL_CURRENT_LEVEL           int32  = 925
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1065,6 +1065,7 @@ const (
 	MQCMDL_LEVEL_922               int32  = 922
 	MQCMDL_LEVEL_923               int32  = 923
 	MQCMDL_LEVEL_924               int32  = 924
+	MQCMDL_LEVEL_925               int32  = 925
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -2667,6 +2668,7 @@ const (
 	MQIMMREASON_NONE               int32  = 0
 	MQIMMREASON_NOT_CLIENT         int32  = 1
 	MQIMMREASON_NOT_RECONNECTABLE  int32  = 2
+	MQIMMREASON_NO_REDIRECT        int32  = 7
 	MQIMPO_CONVERT_TYPE            int32  = 2
 	MQIMPO_CONVERT_VALUE           int32  = 32
 	MQIMPO_CURRENT_LENGTH          int32  = 64

diff --git a/ibmmq/cmqc_linux_ppc64le.go b/ibmmq/cmqc_linux_ppc64le.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  11/4/21 3:44 PM
-*   Build Level:   p924-L211104
+*   Generated on:  2/7/22 6:36 PM
+*   Build Level:   p925-L220207
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1019,7 +1019,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 924
+	MQCMDL_CURRENT_LEVEL           int32  = 925
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1065,6 +1065,7 @@ const (
 	MQCMDL_LEVEL_922               int32  = 922
 	MQCMDL_LEVEL_923               int32  = 923
 	MQCMDL_LEVEL_924               int32  = 924
+	MQCMDL_LEVEL_925               int32  = 925
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -2667,6 +2668,7 @@ const (
 	MQIMMREASON_NONE               int32  = 0
 	MQIMMREASON_NOT_CLIENT         int32  = 1
 	MQIMMREASON_NOT_RECONNECTABLE  int32  = 2
+	MQIMMREASON_NO_REDIRECT        int32  = 7
 	MQIMPO_CONVERT_TYPE            int32  = 2
 	MQIMPO_CONVERT_VALUE           int32  = 32
 	MQIMPO_CURRENT_LENGTH          int32  = 64

diff --git a/ibmmq/cmqc_linux_s390x.go b/ibmmq/cmqc_linux_s390x.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  11/4/21 3:44 PM
-*   Build Level:   p924-L211104
+*   Generated on:  2/7/22 6:36 PM
+*   Build Level:   p925-L220207
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1019,7 +1019,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 924
+	MQCMDL_CURRENT_LEVEL           int32  = 925
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1065,6 +1065,7 @@ const (
 	MQCMDL_LEVEL_922               int32  = 922
 	MQCMDL_LEVEL_923               int32  = 923
 	MQCMDL_LEVEL_924               int32  = 924
+	MQCMDL_LEVEL_925               int32  = 925
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -2667,6 +2668,7 @@ const (
 	MQIMMREASON_NONE               int32  = 0
 	MQIMMREASON_NOT_CLIENT         int32  = 1
 	MQIMMREASON_NOT_RECONNECTABLE  int32  = 2
+	MQIMMREASON_NO_REDIRECT        int32  = 7
 	MQIMPO_CONVERT_TYPE            int32  = 2
 	MQIMPO_CONVERT_VALUE           int32  = 32
 	MQIMPO_CURRENT_LENGTH          int32  = 64

diff --git a/ibmmq/cmqc_windows.go b/ibmmq/cmqc_windows.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  11/4/21 3:44 PM
-*   Build Level:   p924-L211104
+*   Generated on:  2/7/22 6:36 PM
+*   Build Level:   p925-L220207
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1019,7 +1019,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 924
+	MQCMDL_CURRENT_LEVEL           int32  = 925
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1065,6 +1065,7 @@ const (
 	MQCMDL_LEVEL_922               int32  = 922
 	MQCMDL_LEVEL_923               int32  = 923
 	MQCMDL_LEVEL_924               int32  = 924
+	MQCMDL_LEVEL_925               int32  = 925
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -2667,6 +2668,7 @@ const (
 	MQIMMREASON_NONE               int32  = 0
 	MQIMMREASON_NOT_CLIENT         int32  = 1
 	MQIMMREASON_NOT_RECONNECTABLE  int32  = 2
+	MQIMMREASON_NO_REDIRECT        int32  = 7
 	MQIMPO_CONVERT_TYPE            int32  = 2
 	MQIMPO_CONVERT_VALUE           int32  = 32
 	MQIMPO_CURRENT_LENGTH          int32  = 64

diff --git a/ibmmq/mqiMQCNO.go b/ibmmq/mqiMQCNO.go
@@ -1,7 +1,7 @@
 package ibmmq
 
 /*
-  Copyright (c) IBM Corporation 2016,2021
+  Copyright (c) IBM Corporation 2016,2022
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -34,27 +34,27 @@ to select what can be done.
 
 void freeCnoCCDTUrl(MQCNO *mqcno) {
 #if defined(MQCNO_VERSION_6) && MQCNO_CURRENT_VERSION >= MQCNO_VERSION_6
-	if (mqcno->CCDTUrlPtr != NULL) {
-		free(mqcno->CCDTUrlPtr);
-	}
+  if (mqcno->CCDTUrlPtr != NULL) {
+    free(mqcno->CCDTUrlPtr);
+  }
 #endif
 }
 
 void setCnoCCDTUrl(MQCNO *mqcno, PMQCHAR url, MQLONG length) {
 #if defined(MQCNO_VERSION_6) && MQCNO_CURRENT_VERSION >= MQCNO_VERSION_6
   if (mqcno->Version < MQCNO_VERSION_6) {
 	  mqcno->Version = MQCNO_VERSION_6;
-	}
-	mqcno->CCDTUrlOffset = 0;
-	mqcno->CCDTUrlPtr = NULL;
-	mqcno->CCDTUrlLength = length;
-	if (url != NULL && length > 0) {
-		mqcno->CCDTUrlPtr = url;
-	}
+  }
+  mqcno->CCDTUrlOffset = 0;
+  mqcno->CCDTUrlPtr = NULL;
+  mqcno->CCDTUrlLength = length;
+  if (url != NULL && length > 0) {
+    mqcno->CCDTUrlPtr = url;
+  }
 #else
-	if (url != NULL) {
-		free(url);
-	}
+  if (url != NULL) {
+    free(url);
+  }
 #endif
 }
 
@@ -75,21 +75,21 @@ void setCnoApplName(MQCNO *mqcno, PMQCHAR applName, MQLONG length) {
   return;
 }
 
-// A totally new structure in MQ 9.2.4. In order to handle builds against older versions of MQ
+// A new structure in MQ 9.2.4. In order to handle builds against older versions of MQ
 // we have to extract the individual fields from the Go version of the structure first. And
 // we then use those as separate parameters to this function.
 void setCnoBalanceParms(MQCNO *mqcno, MQLONG ApplType, MQLONG Timeout, MQLONG Options) {
 #if defined(MQCNO_VERSION_8) && MQCNO_CURRENT_VERSION >= MQCNO_VERSION_8
   PMQBNO pmqbno = malloc(MQBNO_CURRENT_LENGTH); // This is freed on return from the C function
   pmqbno->Version = MQBNO_VERSION_1;
-	memcpy(pmqbno->StrucId,MQBNO_STRUC_ID,4);
+  memcpy(pmqbno->StrucId,MQBNO_STRUC_ID,4);
   pmqbno->ApplType = ApplType;
   pmqbno->Timeout = Timeout;
   pmqbno->Options = Options;
   mqcno->BalanceParmsPtr = pmqbno;
-	mqcno->BalanceParmsOffset = 0;
+  mqcno->BalanceParmsOffset = 0;
   if (mqcno->Version < MQCNO_VERSION_8) {
-  	mqcno->Version = MQCNO_VERSION_8;
+    mqcno->Version = MQCNO_VERSION_8;
   }
 #endif
   return;
@@ -98,8 +98,8 @@ void setCnoBalanceParms(MQCNO *mqcno, MQLONG ApplType, MQLONG Timeout, MQLONG Op
 void freeCnoBalanceParms(MQCNO *mqcno) {
 #if defined(MQCNO_VERSION_8) && MQCNO_CURRENT_VERSION >= MQCNO_VERSION_8
   if (mqcno->Version >= MQCNO_VERSION_8 && mqcno->BalanceParmsPtr != NULL) {
-	  free(mqcno->BalanceParmsPtr);
-	}
+    free(mqcno->BalanceParmsPtr);
+  }
 #endif
   return;
 }