Merge pull request #94 from ibm-messaging/cbmh2

Make callbacks explicitly pass the hConn (#93)

Author: ibmmqmet

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 Newest updates are at the top of this file.
 
+## March 26 2019
+* BREAKING API: Add hConn to callback function
+* Callbacks not setting hConn correctly (#93)
+
 ## March 20 2019 - v4.0.0
 * Update for MQ 9.1.2 - ApplName now settable during Connect
 * BREAKING API: deprecated Inq()/MQINQ implementation replaced.

ibmmq/mqicb.go

@@ -38,7 +38,7 @@ import (
 )
 
 // The user's callback function must match this signature
-type MQCB_FUNCTION func(*MQObject, *MQMD, *MQGMO, []byte, *MQCBC, *MQReturn)
+type MQCB_FUNCTION func(*MQQueueManager, *MQObject, *MQMD, *MQGMO, []byte, *MQCBC, *MQReturn)
 
 // Need to keep references to the user's callback function and some other
 // structure elements which do not map to the C functions, or do not need to
@@ -119,14 +119,17 @@ func MQCALLBACK_Go(hConn C.MQHCONN, mqmd *C.MQMD, mqgmo *C.MQGMO, mqBuffer C.PMQ
 	}
 
 	if ok {
+		if gogmo.MsgHandle.hMsg != C.MQHM_NONE {
+			gogmo.MsgHandle.qMgr = cbHObj.qMgr
+		}
 
 		gocbc.CallbackArea = info.callbackArea
 		gocbc.ConnectionArea = info.connectionArea
 
 		// Get the data
 		b := C.GoBytes(unsafe.Pointer(mqBuffer), C.int(mqcbc.DataLength))
 		// And finally call the user function
-		info.callbackFunction(cbHObj, gomd, gogmo, b, gocbc, mqreturn)
+		info.callbackFunction(cbHObj.qMgr, cbHObj, gomd, gogmo, b, gocbc, mqreturn)
 	}
 }
 

samples/amqscb.go

@@ -41,6 +41,7 @@ import (
 
 var qMgrObject ibmmq.MQObject
 var qObject ibmmq.MQObject
+var mh ibmmq.MQMessageHandle
 
 var ok = true
 
@@ -50,7 +51,7 @@ func main() {
 }
 
 // This is the callback function invoked when a message arrives on the queue.
-func cb(hObj *ibmmq.MQObject, md *ibmmq.MQMD, gmo *ibmmq.MQGMO, buffer []byte, cbc *ibmmq.MQCBC, err *ibmmq.MQReturn) {
+func cb(hConn *ibmmq.MQQueueManager, hObj *ibmmq.MQObject, md *ibmmq.MQMD, gmo *ibmmq.MQGMO, buffer []byte, cbc *ibmmq.MQCBC, err *ibmmq.MQReturn) {
 	buflen := len(buffer)
 	if err.MQCC != ibmmq.MQCC_OK {
 		fmt.Println(err)
@@ -113,6 +114,11 @@ func mainWithRc() int {
 		}
 	}
 
+	if err == nil {
+		cmho := ibmmq.NewMQCMHO()
+		mh, err = qMgrObject.CrtMH(cmho)
+	}
+
 	if err == nil {
 		// The GET/MQCB requires control structures, the Message Descriptor (MQMD)
 		// and Get Options (MQGMO). Create those with default values.
@@ -128,6 +134,9 @@ func mainWithRc() int {
 		gmo.Options |= ibmmq.MQGMO_WAIT
 		gmo.WaitInterval = 3 * 1000 // The WaitInterval is in milliseconds
 
+		gmo.Options |= ibmmq.MQGMO_PROPERTIES_IN_HANDLE
+		gmo.MsgHandle = mh
+
 		// The MQCBD structure is used to specify the function to be invoked
 		// when a message arrives on a queue
 		cbd := ibmmq.NewMQCBD()