Copied correlator field from WQ/WTAS structures into WTID for easier linkage

Author: ibmmqmet

bin/aix/mqsmfcsv

@@ -136,6 +136,7 @@ int main( int argc, char *argv[] )
   int qTriplet;
   char *p;
   qwhs *pqwhs;
+  unsigned char correlid[16];
 
   BOOL error = FALSE;
   BOOL knownSubType = TRUE;
@@ -663,8 +664,7 @@ int main( int argc, char *argv[] )
 
       case 1:
       case 2:
-        p = &dataBuf[triplet[1].offset  ];
-        printWTID((wtid *)p);
+        memset(correlid,0,16);
 
         /*****************************************************************/
         /* The queue records may or may not exist in subtype 1 records.  */
@@ -678,6 +678,7 @@ int main( int argc, char *argv[] )
         {
           p = &dataBuf[triplet[2].offset  ];
           printWTAS((wtas *)p);
+          memcpy(correlid,&((wtas *)p)->wtasstrt,16);
 
           if (conv32(((wtas *)p)->wtaswqct) > 0)
             qTriplet = 3;
@@ -696,8 +697,12 @@ int main( int argc, char *argv[] )
           {
             p = &dataBuf[triplet[qTriplet].offset + triplet[qTriplet].l * i];
             printWQ((wq *)p);
+            memcpy(correlid,((wq *)p)->correl,16);
           }
         }
+        p = &dataBuf[triplet[1].offset  ];
+        printWTID((wtid *)p,correlid);
+
         break;
 
 

bin/linux/mqsmfcsv

@@ -149,7 +149,7 @@ extern void printQSST  (qsst *);
 extern void printQTST  (qtst *);
 extern void printWQ    (wq   *);
 extern void printWTAS  (wtas *);
-extern void printWTID  (wtid *);
+extern void printWTID  (wtid *, unsigned char *);
 
 extern void openDDL    (char *);
 extern void closeDDL   (void);

bin/win/convH.exe

@@ -14,10 +14,11 @@
 
 SMFPRINTGLOB;
 
-void printWTID(wtid *p)
+void printWTID(wtid *p, unsigned char *correlid)
 {
   SMFPRINTSTART("WTID", p, conv16(p->wtidlen));
 
+  ADDSTRB ("WTAS_Correlator",correlid,16);
   ADDSTR  ("Appl_Type", strConnType(conv32(p->wtidatyp)),16);
   ADDSTREN("Connection_Name", p->wtidccn, 8);
   ADDSTREN("Operator_ID", p->wtidopid,8);