aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/dbt_scanner10.cpp95
-rw-r--r--examples/java/DBTScanner10.java56
2 files changed, 3 insertions, 148 deletions
diff --git a/examples/dbt_scanner10.cpp b/examples/dbt_scanner10.cpp
index ab00e23e..d51e8b32 100644
--- a/examples/dbt_scanner10.cpp
+++ b/examples/dbt_scanner10.cpp
@@ -126,9 +126,6 @@ static bool REMOVE_DEVICE = true;
static bool USE_WHITELIST = false;
static jau::darray<BDAddressAndType> WHITELIST;
-static std::string charIdentifier = "";
-static int charValue = 0;
-
static bool SHOW_UPDATE_EVENTS = false;
static bool QUIET = false;
@@ -174,12 +171,6 @@ class MyAdapterStatusListener : public AdapterStatusListener {
bool deviceFound(std::shared_ptr<BTDevice> device, const uint64_t timestamp) override {
(void)timestamp;
- if( BDAddressType::BDADDR_LE_PUBLIC != device->getAddressAndType().type
- && BLERandomAddressType::STATIC_PUBLIC != device->getAddressAndType().getBLERandomAddressType() ) {
- // Requires BREDR or LE Secure Connection support: WIP
- fprintf_td(stderr, "****** FOUND__-2: Skip non 'public LE' and non 'random static public LE' %s\n", device->toString(true).c_str());
- return false;
- }
if( !BTDeviceRegistry::isDeviceProcessing( device->getAddressAndType() ) &&
( !BTDeviceRegistry::isWaitingForAnyDevice() ||
( BTDeviceRegistry::isWaitingForDevice(device->getAddressAndType().address, device->getName()) &&
@@ -363,25 +354,6 @@ class MyGATTEventListener : public BTGattChar::Listener {
static void connectDiscoveredDevice(std::shared_ptr<BTDevice> device) {
fprintf_td(stderr, "****** Connecting Device: Start %s\n", device->toString().c_str());
- // Testing listener lifecycle @ device dtor
- class TempAdapterStatusListener : public AdapterStatusListener {
- void deviceUpdated(std::shared_ptr<BTDevice> device, const EIRDataType updateMask, const uint64_t timestamp) override {
- if( SHOW_UPDATE_EVENTS ) {
- fprintf_td(stderr, "****** UPDATED(2): %s of %s\n", to_string(updateMask).c_str(), device->toString(true).c_str());
- }
- (void)timestamp;
- }
- void deviceConnected(std::shared_ptr<BTDevice> device, const uint16_t handle, const uint64_t timestamp) override {
- fprintf_td(stderr, "****** CONNECTED(2): %s\n", device->toString(true).c_str());
- (void)handle;
- (void)timestamp;
- }
- std::string toString() const override {
- return "TempAdapterStatusListener[this "+to_hexstring(this)+"]";
- }
- };
- device->addStatusListener(std::shared_ptr<AdapterStatusListener>(new TempAdapterStatusListener()));
-
{
const HCIStatusCode r = device->unpair();
fprintf_td(stderr, "****** Connecting Device: Unpair-Pre result: %s\n", to_string(r).c_str());
@@ -454,14 +426,6 @@ static void processReadyDevice(std::shared_ptr<BTDevice> device) {
to_string(res).c_str(), to_string(resTx).c_str(), to_string(resRx).c_str());
}
- struct GattCharAndListener {
- BTGattCharRef gattCharRef;
- std::shared_ptr<BTGattChar::Listener> listenerRef;
- };
-
- // Validate consistency of GATTHandler [add|remove]CharListener()
- std::vector<GattCharAndListener> gattCharAndListenerList;
-
//
// GATT Service Processing
//
@@ -490,34 +454,6 @@ static void processReadyDevice(std::shared_ptr<BTDevice> device) {
"PERF: adapter-init to gatt-complete %" PRIu64 " ms\n\n",
td01, td15, tdc5, (tdc5 - td15), td05);
}
-#if 0
- {
- // WIP: Implement a simple Characteristic ping-pong writeValue <-> notify transmission for stress testing.
- BTManager & manager = device->getAdapter().getManager();
- if( nullptr != charIdentifier && charIdentifier.length() > 0 ) {
- BTGattChar * char2 = (BTGattChar*) nullptr;
- // manager.find(BluetoothType.GATT_CHARACTERISTIC, null, charIdentifier, device);
- fprintf_td(stderr, "Char UUID %s\n", charIdentifier.c_str());
- fprintf_td(stderr, " over device : %s\n", char2->toString().c_str());
- if( nullptr != char2 ) {
- bool cccdEnableResult[2];
- bool cccdRet = char2->addCharListener( std::shared_ptr<BTGattCharListener>( new MyGATTEventListener(char2) ),
- cccdEnableResult );
- if( !QUIET ) {
- fprintf_td(stderr, "Added CharPingPongListenerRes Notification(%d), Indication(%d): Result %d\n",
- cccdEnableResult[0], cccdEnableResult[1], cccdRet);
- }
- if( cccdRet ) {
- uint8_t cmd[] { (uint8_t)charValue }; // request device model
- bool wres = char2->writeValueNoResp(cmd);
- if( !QUIET ) {
- fprintf_td(stderr, "Write response: "+wres);
- }
- }
- }
- }
- }
-#endif
std::shared_ptr<GattGenericAccessSvc> ga = device->getGattGenericAccess();
if( nullptr != ga && !QUIET ) {
@@ -567,10 +503,6 @@ static void processReadyDevice(std::shared_ptr<BTDevice> device) {
bool cccdEnableResult[2];
std::shared_ptr<BTGattChar::Listener> cl = std::make_shared<MyGATTEventListener>(i, j);
bool cccdRet = serviceChar->addCharListener( cl, cccdEnableResult );
- if( cccdRet ) {
- // Validate consistency of GATTHandler [add|remove]CharListener()
- gattCharAndListenerList.push_back( GattCharAndListener{ serviceChar, cl } );
- }
if( !QUIET ) {
fprintf_td(stderr, " [%2.2d.%2.2d] Characteristic-Listener: Notification(%d), Indication(%d): Added %d; %u charListener\n",
(int)i, (int)j, cccdEnableResult[0], cccdEnableResult[1], cccdRet, device->getGattHandler()->getCharListenerCount());
@@ -591,11 +523,6 @@ exit:
fprintf_td(stderr, "****** Processing Ready Device: End-1: Success %d on %s; devInProc %zu; %zu charListener\n",
success, device->toString().c_str(), BTDeviceRegistry::getProcessingDeviceCount(), totalCharListener);
- // Validate consistency of GATTHandler [add|remove]CharListener()
- if( totalCharListener != gattCharAndListenerList.size() ) {
- ERR_PRINT("Char-Listener %zu actual != %zu cached\n", totalCharListener, gattCharAndListenerList.size());
- }
-
BTDeviceRegistry::removeFromProcessingDevices(device->getAddressAndType());
if( !USE_WHITELIST && 0 == BTDeviceRegistry::getProcessingDeviceCount() ) {
@@ -621,18 +548,7 @@ exit:
if( success ) {
BTDeviceRegistry::addToProcessedDevices(device->getAddressAndType(), device->getName());
}
-
- // Validate consistency of GATTHandler [add|remove]CharListener()
- {
- //device->removeAllCharListener();
- for( GattCharAndListener gcl : gattCharAndListenerList ) {
- gcl.gattCharRef->removeCharListener(gcl.listenerRef);
- }
- gattCharAndListenerList.clear();
- if( 0 != gattCharAndListenerList.size() ) {
- ERR_PRINT("Char-Listener not zero but %zu\n", gattCharAndListenerList.size());
- }
- }
+ device->removeAllCharListener();
if( !KEEP_CONNECTED ) {
{
@@ -815,6 +731,8 @@ int main(int argc, char *argv[])
bool waitForEnter=false;
for(int i=1; i<argc; i++) {
+ fprintf(stderr, "arg[%d/%d]: '%s'\n", i, argc, argv[i]);
+
if( !strcmp("-dbt_debug", argv[i]) && argc > (i+1) ) {
setenv("direct_bt.debug", argv[++i], 1 /* overwrite */);
} else if( !strcmp("-dbt_verbose", argv[i]) && argc > (i+1) ) {
@@ -868,10 +786,6 @@ int main(int argc, char *argv[])
BTSecurityRegistry::Entry* sec = BTSecurityRegistry::getOrCreate(addrOrNameSub);
sec->io_cap_auto = to_SMPIOCapability(atoi(argv[++i]));
fprintf(stderr, "Set SEC AUTO security io_cap in %s\n", sec->toString().c_str());
- } else if( !strcmp("-charid", argv[i]) && argc > (i+1) ) {
- charIdentifier = std::string(argv[++i]);
- } else if( !strcmp("-charval", argv[i]) && argc > (i+1) ) {
- charValue = atoi(argv[++i]);
} else if( !strcmp("-disconnect", argv[i]) ) {
KEEP_CONNECTED = false;
} else if( !strcmp("-enableGATTPing", argv[i]) ) {
@@ -899,7 +813,6 @@ int main(int argc, char *argv[])
"(-secauto <device_[address|name]_sub> <int_iocap>)* "
"(-passkey <device_[address|name]_sub> <digits>)* "
"[-unpairPre] [-unpairPost] "
- "[-charid <uuid>] [-charval <byte-val>] "
"[-dbt_verbose true|false] "
"[-dbt_debug true|false|adapter.event,gatt.data,hci.event,hci.scan_ad_eir,mgmt.event] "
"[-dbt_mgmt cmd.timeout=3000,ringsize=64,...] "
@@ -919,8 +832,6 @@ int main(int argc, char *argv[])
fprintf(stderr, "adapter %s\n", useAdapter.toString().c_str());
fprintf(stderr, "btmode %s\n", to_string(btMode).c_str());
fprintf(stderr, "scanActive %s\n", to_string(le_scan_active).c_str());
- fprintf(stderr, "characteristic-id: %s\n", charIdentifier.c_str());
- fprintf(stderr, "characteristic-value: %d\n", charValue);
fprintf(stderr, "security-details: %s\n", BTSecurityRegistry::allToString().c_str());
fprintf(stderr, "waitForDevice: %s\n", BTDeviceRegistry::getWaitForDevicesString().c_str());
diff --git a/examples/java/DBTScanner10.java b/examples/java/DBTScanner10.java
index b1995f0b..622ccf78 100644
--- a/examples/java/DBTScanner10.java
+++ b/examples/java/DBTScanner10.java
@@ -97,9 +97,6 @@ public class DBTScanner10 {
boolean USE_WHITELIST = false;
final List<BDAddressAndType> whitelist = new ArrayList<BDAddressAndType>();
- String charIdentifier = null;
- int charValue = 0;
-
boolean SHOW_UPDATE_EVENTS = false;
boolean QUIET = false;
@@ -171,12 +168,6 @@ public class DBTScanner10 {
public boolean deviceFound(final BTDevice device, final long timestamp) {
BTUtils.println(System.err, "****** FOUND__: "+device.toString());
- if( BDAddressType.BDADDR_LE_PUBLIC != device.getAddressAndType().type
- && BLERandomAddressType.STATIC_PUBLIC != device.getAddressAndType().getBLERandomAddressType() ) {
- // Requires BREDR or LE Secure Connection support: WIP
- BTUtils.println(System.err, "****** FOUND__-2: Skip non 'public LE' and non 'random static public LE' "+device.toString());
- return false;
- }
if( !BTDeviceRegistry.isDeviceProcessing( device.getAddressAndType() ) &&
( !BTDeviceRegistry.isWaitingForAnyDevice() ||
( BTDeviceRegistry.isWaitingForDevice(device.getAddressAndType().address, device.getName()) &&
@@ -486,45 +477,6 @@ public class DBTScanner10 {
"PERF: discovered to gatt-complete " + tdc5 + " ms (connect " + (tdc5 - td15) + " ms),"+System.lineSeparator()+
"PERF: adapter-init to gatt-complete " + td05 + " ms"+System.lineSeparator());
}
- {
- // WIP: Implement a simple Characteristic ping-pong writeValue <-> notify transmission for stress testing.
- final BTManager manager = device.getAdapter().getManager();
- if( null != charIdentifier && charIdentifier.length() > 0 ) {
- final BTGattChar char2 = (BTGattChar)
- manager.find(BTType.GATT_CHARACTERISTIC, null, charIdentifier, device);
- BTUtils.println(System.err, "Char UUID "+charIdentifier);
- BTUtils.println(System.err, " over device : "+char2);
- if( null != char2 ) {
- final BTGattChar.Listener charPingPongListener = new BTGattChar.Listener() {
- @Override
- public void notificationReceived(final BTGattChar charDecl,
- final byte[] value, final long timestamp) {
- BTUtils.println(System.err, "****** PingPong GATT notificationReceived: "+charDecl+
- ", value "+BTUtils.bytesHexString(value, 0, -1, true));
- }
-
- @Override
- public void indicationReceived(final BTGattChar charDecl,
- final byte[] value, final long timestamp, final boolean confirmationSent) {
- BTUtils.println(System.err, "****** PingPong GATT indicationReceived: "+charDecl+
- ", value "+BTUtils.bytesHexString(value, 0, -1, true));
- }
- };
- final boolean enabledState[] = { false, false };
- final boolean addedCharPingPongListenerRes = null != char2.addCharListener(charPingPongListener, enabledState);
- if( !QUIET ) {
- BTUtils.println(System.err, "Added CharPingPongListenerRes: "+addedCharPingPongListenerRes+", enabledState "+Arrays.toString(enabledState));
- }
- if( addedCharPingPongListenerRes ) {
- final byte[] cmd = { (byte)charValue }; // request device model
- final boolean wres = char2.writeValue(cmd, false /* withResponse */);
- if( !QUIET ) {
- BTUtils.println(System.err, "Write response: "+wres);
- }
- }
- }
- }
- }
try {
int i=0;
@@ -889,10 +841,6 @@ public class DBTScanner10 {
final int io_cap_i = Integer.valueOf(args[++i]).intValue();
sec.io_cap_auto = SMPIOCapability.get( (byte)( io_cap_i & 0xff ) );
System.err.println("Set SEC AUTO security io_cap "+io_cap_i+" in "+sec);
- } else if( arg.equals("-charid") && args.length > (i+1) ) {
- test.charIdentifier = args[++i];
- } else if( arg.equals("-charval") && args.length > (i+1) ) {
- test.charValue = Integer.valueOf(args[++i]).intValue();
} else if( arg.equals("-disconnect") ) {
test.KEEP_CONNECTED = false;
} else if( arg.equals("-enableGATTPing") ) {
@@ -917,7 +865,6 @@ public class DBTScanner10 {
"(-iocap <device_[address|name]_sub> <int_iocap>)* "+
"(-secauto <device_[address|name]_sub> <int_iocap>)* "+
"(-passkey <device_[address|name]_sub> <digits>)* "+
- "[-charid <uuid>] [-charval <byte-val>] "+
"[-verbose] [-debug] "+
"[-dbt_verbose true|false] "+
"[-dbt_debug true|false|adapter.event,gatt.data,hci.event,hci.scan_ad_eir,mgmt.event] "+
@@ -939,9 +886,6 @@ public class DBTScanner10 {
BTUtils.println(System.err, "adapter "+test.useAdapter);
BTUtils.println(System.err, "btmode' to "+test.btMode.toString());
- BTUtils.println(System.err, "characteristic-id: "+test.charIdentifier);
- BTUtils.println(System.err, "characteristic-value: "+test.charValue);
-
BTUtils.println(System.err, "security-details: "+BTSecurityRegistry.allToString() );
BTUtils.println(System.err, "waitForDevices: "+BTDeviceRegistry.getWaitForDevicesString());
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 11:25:33 +0000