From 80d26d702db5187b2aad81a29072f2eeef4798ae Mon Sep 17 00:00:00 2001
From: Chris Thornton <cwgthornton@gmail.com>
Date: Mon, 6 Apr 2020 13:34:36 -0700
Subject: [PATCH] Add types to gattlib_(dis)connect in gattlib-py

The return type defaults to int for connect, causing the pointer to get
corrupted. Similarly, the disconnect call needs to avoid truncating the
handle.
---
 gattlib-py/gattlib/__init__.py | 9 +++++++++
 gattlib-py/gattlib/device.py   | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gattlib-py/gattlib/__init__.py b/gattlib-py/gattlib/__init__.py
index 047840d..0fec451 100644
--- a/gattlib-py/gattlib/__init__.py
+++ b/gattlib-py/gattlib/__init__.py
@@ -86,6 +86,15 @@ gattlib_adapter_scan_enable_with_filter.argtypes = [c_void_p, POINTER(POINTER(Ga
 gattlib_adapter_scan_eddystone = gattlib.gattlib_adapter_scan_eddystone
 gattlib_adapter_scan_eddystone.argtypes = [c_void_p, c_int16, c_uint32, gattlib_discovered_device_with_data_type, c_int, py_object]
 
+# gatt_connection_t *gattlib_connect(const char *src, const char *dst, unsigned long options);
+gattlib_connect = gattlib.gattlib_connect
+gattlib_connect.restype = c_void_p
+gattlib_connect.argtypes = [c_char_p, c_char_p, c_ulong]
+
+# int gattlib_disconnect(gatt_connection_t* connection);
+gattlib_disconnect = gattlib.gattlib_disconnect
+gattlib_disconnect.argtypes = [c_void_p]
+
 # int gattlib_discover_primary(gatt_connection_t* connection, gattlib_primary_service_t** services, int* services_count);
 gattlib_discover_primary = gattlib.gattlib_discover_primary
 gattlib_discover_primary.argtypes = [c_void_p, POINTER(POINTER(GattlibPrimaryService)), POINTER(c_int)]
diff --git a/gattlib-py/gattlib/device.py b/gattlib-py/gattlib/device.py
index 111bd04..60dbb5a 100644
--- a/gattlib-py/gattlib/device.py
+++ b/gattlib-py/gattlib/device.py
@@ -49,7 +49,7 @@ class Device:
         else:
             adapter_name = None
 
-        self._connection = gattlib.gattlib_connect(adapter_name, self._addr, options)
+        self._connection = gattlib_connect(adapter_name, self._addr, options)
         if self._connection == 0:
             raise DeviceError()
 
@@ -74,7 +74,7 @@ class Device:
         gattlib_register_on_disconnect(self._connection, Device.on_disconnection, self)
 
     def disconnect(self):
-        ret = gattlib.gattlib_disconnect(self._connection)
+        ret = gattlib_disconnect(self._connection)
         handle_return(ret)
 
     def discover(self):