summaryrefslogtreecommitdiffstats
path: root/src/direct_bt
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2022-04-23 01:09:23 +0200
committerSven Gothel <[email protected]>2022-04-23 04:44:35 +0200
commita5a28d33b18e11a9d3a2d3d13b8b736884c604e0 (patch)
treeb29ed43f689a199ade86385222c5d42ce8397af1 /src/direct_bt
parent6b5e060dcacb58824a90520fb07522d5b4192749 (diff)
L2CAPComm: Detail 'irqed' in intern and extern at output; BTGattHandler DBG_PRINT 'GATTHandler::ctor: Started' post l2cap_reader_service start
Diffstat (limited to 'src/direct_bt')
-rw-r--r--src/direct_bt/BTGattHandler.cpp5
-rw-r--r--src/direct_bt/L2CAPComm.cpp6
2 files changed, 6 insertions, 5 deletions
diff --git a/src/direct_bt/BTGattHandler.cpp b/src/direct_bt/BTGattHandler.cpp
index 714937ea..44853f24 100644
--- a/src/direct_bt/BTGattHandler.cpp
+++ b/src/direct_bt/BTGattHandler.cpp
@@ -583,8 +583,6 @@ BTGattHandler::BTGattHandler(const BTDeviceRef &device, L2CAPClient& l2cap_att,
is_connected = false;
return;
}
- DBG_PRINT("GATTHandler::ctor: Start Connect: GattHandler[%s], l2cap[%s]: %s",
- getStateString().c_str(), l2cap.getStateString().c_str(), toString().c_str());
/**
* We utilize DBTManager's mgmthandler_sigaction SIGALRM handler,
@@ -594,6 +592,9 @@ BTGattHandler::BTGattHandler(const BTDeviceRef &device, L2CAPClient& l2cap_att,
l2cap.set_interrupted_query( jau::bindMemberFunc(this, &BTGattHandler::l2capReaderInterrupted) );
l2cap_reader_service.start();
+ DBG_PRINT("GATTHandler::ctor: Started: GattHandler[%s], l2cap[%s]: %s",
+ getStateString().c_str(), l2cap.getStateString().c_str(), toString().c_str());
+
if( GATTRole::Client == getRole() ) {
// MTU to be negotiated via initClientGatt() from this GATT client later
serverMTU = number(Defaults::MAX_ATT_MTU);
diff --git a/src/direct_bt/L2CAPComm.cpp b/src/direct_bt/L2CAPComm.cpp
index cc2631f4..c8c52295 100644
--- a/src/direct_bt/L2CAPComm.cpp
+++ b/src/direct_bt/L2CAPComm.cpp
@@ -81,10 +81,10 @@ std::string L2CAPComm::getStateString(bool isOpen, bool hasIOError) noexcept {
", errno "+std::to_string(errno)+" ("+std::string(strerror(errno))+")]";
}
-std::string L2CAPComm::getStateString(bool isOpen, bool isInterrupted, bool hasIOError) noexcept {
+std::string L2CAPComm::getStateString(bool isOpen, bool irqed_int, bool irqed_ext, bool hasIOError) noexcept {
return "State[open "+std::to_string(isOpen)+
- ", irqed "+std::to_string(isInterrupted)+
- ", ioerr "+std::to_string(hasIOError)+
+ ", irqed "+std::to_string(irqed_int || irqed_ext)+" [int "+std::to_string(irqed_int)+", ext "+std::to_string(irqed_ext)+
+ "], ioerr "+std::to_string(hasIOError)+
", errno "+std::to_string(errno)+" ("+std::string(strerror(errno))+")]";
}