Fix compilation errors after latest changes in seabolt

connector.go

@@ -122,15 +122,19 @@ func (conn *neo4jConnector) Acquire(mode AccessMode) (Connection, error) {
 		cMode = C.BOLT_ACCESS_MODE_READ
 	}
 
-	cResult := C.BoltConnector_acquire(conn.cInstance, C.BoltAccessMode(cMode))
-	if cResult.connection == nil {
-		codeText := C.GoString(C.BoltError_get_string(cResult.connection_error))
-		context := C.GoString(cResult.connection_error_ctx)
-
-		return nil, newConnectorError(int(cResult.connection_status), int(cResult.connection_error), codeText, context, "unable to acquire connection from connector")
+	cStatus := C.BoltStatus_create()
+	defer C.BoltStatus_destroy(cStatus)
+	cConnection := C.BoltConnector_acquire(conn.cInstance, C.BoltAccessMode(cMode), cStatus)
+	if cConnection == nil {
+		state := C.BoltStatus_get_state(cStatus)
+		code := C.BoltStatus_get_error(cStatus)
+		codeText := C.GoString(C.BoltError_get_string(code))
+		context := C.GoString(C.BoltStatus_get_error_context(cStatus))
+
+		return nil, newConnectorError(int(state), int(code), codeText, context, "unable to acquire connection from connector")
 	}
 
-	return &neo4jConnection{connector: conn, cInstance: cResult.connection, valueSystem: conn.valueSystem}, nil
+	return &neo4jConnection{connector: conn, cInstance: cConnection, valueSystem: conn.valueSystem}, nil
 }
 
 func (conn *neo4jConnector) release(connection *neo4jConnection) error {
@@ -172,7 +176,7 @@ func NewConnector(uri *url.URL, authToken map[string]interface{}, config *Config
 
 	if certsBuf != nil {
 		certsBytes := certsBuf.String()
-		C.BoltTrust_set_certs(cTrust, C.CString(certsBytes), C.int(certsBuf.Len()))
+		C.BoltTrust_set_certs(cTrust, C.CString(certsBytes), C.uint64_t(certsBuf.Len()))
 	}
 
 	if config.TLSSkipVerify {

logging.go

@@ -22,13 +22,16 @@ package gobolt
 /*
 #include "bolt/bolt.h"
 
-extern void go_seabolt_log_error_cb(int state, char* message);
-extern void go_seabolt_log_warning_cb(int state, char* message);
-extern void go_seabolt_log_info_cb(int state, char* message);
-extern void go_seabolt_log_debug_cb(int state, char* message);
+extern void go_seabolt_log_error_cb(void* state, char* message);
+extern void go_seabolt_log_warning_cb(void* state, char* message);
+extern void go_seabolt_log_info_cb(void* state, char* message);
+extern void go_seabolt_log_debug_cb(void* state, char* message);
 */
 import "C"
-import "sync"
+import (
+	"sync"
+	"unsafe"
+)
 
 // Logging is the interface that any provided logging target must satisfy for the connector
 // to use
@@ -45,31 +48,31 @@ type Logging interface {
 }
 
 //export go_seabolt_log_error_cb
-func go_seabolt_log_error_cb(state C.int, message *C.char) {
+func go_seabolt_log_error_cb(state unsafe.Pointer, message *C.char) {
 	logging := lookupLogging(state)
 	if logging != nil && logging.ErrorEnabled() {
 		logging.Errorf(C.GoString(message))
 	}
 }
 
 //export go_seabolt_log_warning_cb
-func go_seabolt_log_warning_cb(state C.int, message *C.char) {
+func go_seabolt_log_warning_cb(state unsafe.Pointer, message *C.char) {
 	logging := lookupLogging(state)
 	if logging != nil && logging.WarningEnabled() {
 		logging.Warningf(C.GoString(message))
 	}
 }
 
 //export go_seabolt_log_info_cb
-func go_seabolt_log_info_cb(state C.int, message *C.char) {
+func go_seabolt_log_info_cb(state unsafe.Pointer, message *C.char) {
 	logging := lookupLogging(state)
 	if logging != nil && logging.InfoEnabled() {
 		logging.Infof(C.GoString(message))
 	}
 }
 
 //export go_seabolt_log_debug_cb
-func go_seabolt_log_debug_cb(state C.int, message *C.char) {
+func go_seabolt_log_debug_cb(state unsafe.Pointer, message *C.char) {
 	logging := lookupLogging(state)
 	if logging != nil && logging.DebugEnabled() {
 		logging.Debugf(C.GoString(message))
@@ -85,7 +88,7 @@ func registerLogging(key int, logging Logging) *C.struct_BoltLog {
 
 	mapLogging.Store(key, logging)
 
-	boltLog := C.BoltLog_create(C.int(key))
+	boltLog := C.BoltLog_create(unsafe.Pointer(&key))
 	if logging != nil && logging.ErrorEnabled() {
 		C.BoltLog_set_error_func(boltLog, C.log_func(C.go_seabolt_log_error_cb))
 	}
@@ -105,8 +108,8 @@ func registerLogging(key int, logging Logging) *C.struct_BoltLog {
 	return boltLog
 }
 
-func lookupLogging(key C.int) Logging {
-	if logging, ok := mapLogging.Load(int(key)); ok {
+func lookupLogging(key unsafe.Pointer) Logging {
+	if logging, ok := mapLogging.Load(*(*int)(key)); ok {
 		return logging.(Logging)
 	}
 

resolver.go

@@ -23,7 +23,7 @@ package gobolt
 #include <stdlib.h>
 #include "bolt/bolt.h"
 
-extern void go_seabolt_server_address_resolver_cb(int state, struct BoltAddress *address, struct BoltAddressSet *resolved);
+extern void go_seabolt_server_address_resolver_cb(void* state, struct BoltAddress *address, struct BoltAddressSet *resolved);
 */
 import "C"
 import (
@@ -38,7 +38,7 @@ import (
 type URLAddressResolver func(address *url.URL) []*url.URL
 
 //export go_seabolt_server_address_resolver_cb
-func go_seabolt_server_address_resolver_cb(state C.int, address *C.struct_BoltAddress, resolved *C.struct_BoltAddressSet) {
+func go_seabolt_server_address_resolver_cb(state unsafe.Pointer, address *C.struct_BoltAddress, resolved *C.struct_BoltAddressSet) {
 	resolver := lookupResolver(state)
 	if resolver != nil {
 		resolvedAddresses := resolver(&url.URL{Host: fmt.Sprintf("%s:%s", C.GoString(C.BoltAddress_host(address)), C.GoString(C.BoltAddress_port(address)))})
@@ -66,12 +66,12 @@ func registerResolver(key int, resolver URLAddressResolver) *C.struct_BoltAddres
 
 	mapResolver.Store(key, resolver)
 
-	boltResolver := C.BoltAddressResolver_create(C.int(key), C.address_resolver_func(C.go_seabolt_server_address_resolver_cb))
+	boltResolver := C.BoltAddressResolver_create(unsafe.Pointer(&key), C.address_resolver_func(C.go_seabolt_server_address_resolver_cb))
 	return boltResolver
 }
 
-func lookupResolver(key C.int) URLAddressResolver {
-	if resolver, ok := mapResolver.Load(int(key)); ok {
+func lookupResolver(key unsafe.Pointer) URLAddressResolver {
+	if resolver, ok := mapResolver.Load(*(*int)(key)); ok {
 		return resolver.(URLAddressResolver)
 	}