Merge pull request currantlabs#50 from rkjdid/conn-handlers

hci: add Connect/DisconnectHandler options

Author: estutzenberger

linux/hci/hci.go

@@ -110,6 +110,9 @@ type HCI struct {
 	chMasterConn chan *Conn // Dial returns master connections.
 	chSlaveConn  chan *Conn // Peripheral accept slave connections.
 
+	connectedHandler    func(evt.LEConnectionComplete)
+	disconnectedHandler func(evt.DisconnectionComplete)
+
 	dialerTmo   time.Duration
 	listenerTmo time.Duration
 
@@ -505,6 +508,9 @@ func (h *HCI) handleLEConnectionComplete(b []byte) error {
 		}
 		h.params.RUnlock()
 	}
+	if h.connectedHandler != nil {
+		h.connectedHandler(e)
+	}
 	return nil
 }
 
@@ -546,6 +552,9 @@ func (h *HCI) handleDisconnectionComplete(b []byte) error {
 	c.txBuffer.LockPool()
 	c.txBuffer.PutAll()
 	c.txBuffer.UnlockPool()
+	if h.disconnectedHandler != nil {
+		h.disconnectedHandler(e)
+	}
 	return nil
 }
 

linux/hci/option.go

@@ -2,6 +2,7 @@ package hci
 
 import (
 	"errors"
+	"github.com/go-ble/ble/linux/hci/evt"
 	"time"
 
 	"github.com/go-ble/ble/linux/hci/cmd"
@@ -37,6 +38,18 @@ func (h *HCI) SetScanParams(param cmd.LESetScanParameters) error {
 	return nil
 }
 
+// SetConnectedHandler sets handler to be called when new connection is established.
+func (h *HCI) SetConnectedHandler(f func(complete evt.LEConnectionComplete)) error {
+	h.connectedHandler = f
+	return nil
+}
+
+// SetDisconnectedHandler sets handler to be called on disconnect.
+func (h *HCI) SetDisconnectedHandler(f func(evt.DisconnectionComplete)) error {
+	h.disconnectedHandler = f
+	return nil
+}
+
 // SetAdvParams overrides default advertising parameters.
 func (h *HCI) SetAdvParams(param cmd.LESetAdvertisingParameters) error {
 	h.params.advParams = param

option.go

@@ -1,6 +1,7 @@
 package ble
 
 import (
+	"github.com/go-ble/ble/linux/hci/evt"
 	"time"
 
 	"github.com/go-ble/ble/linux/hci/cmd"
@@ -14,6 +15,8 @@ type DeviceOption interface {
 	SetConnParams(cmd.LECreateConnection) error
 	SetScanParams(cmd.LESetScanParameters) error
 	SetAdvParams(cmd.LESetAdvertisingParameters) error
+	SetConnectedHandler(f func(evt.LEConnectionComplete)) error
+	SetDisconnectedHandler(f func(evt.DisconnectionComplete)) error
 	SetPeripheralRole() error
 	SetCentralRole() error
 }
@@ -69,6 +72,20 @@ func OptAdvParams(param cmd.LESetAdvertisingParameters) Option {
 	}
 }
 
+func OptConnectHandler(f func(evt.LEConnectionComplete)) Option {
+	return func(opt DeviceOption) error {
+		opt.SetConnectedHandler(f)
+		return nil
+	}
+}
+
+func OptDisconnectHandler(f func(evt.DisconnectionComplete)) Option {
+	return func(opt DeviceOption) error {
+		opt.SetDisconnectedHandler(f)
+		return nil
+	}
+}
+
 // OptPeripheralRole configures the device to perform Peripheral tasks.
 func OptPeripheralRole() Option {
 	return func(opt DeviceOption) error {