summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hcid/adapter.c93
-rw-r--r--hcid/adapter.h4
-rw-r--r--hcid/dbus-hci.c61
3 files changed, 90 insertions, 68 deletions
diff --git a/hcid/adapter.c b/hcid/adapter.c
index d5bed46c..32b9039f 100644
--- a/hcid/adapter.c
+++ b/hcid/adapter.c
@@ -461,11 +461,11 @@ static DBusMessage *set_mode(DBusConnection *conn, DBusMessage *msg,
} else {
/* discoverable or limited */
if ((scan_enable & SCAN_INQUIRY) && (new_mode != adapter->mode)) {
- if (adapter->timeout_id)
- g_source_remove(adapter->timeout_id);
+ if (adapter->discov_timeout_id)
+ g_source_remove(adapter->discov_timeout_id);
if (!adapter->sessions && !adapter->discov_timeout)
- adapter->timeout_id = g_timeout_add(adapter->discov_timeout * 1000,
+ adapter->discov_timeout_id = g_timeout_add(adapter->discov_timeout * 1000,
discov_timeout_handler, adapter);
}
}
@@ -555,13 +555,13 @@ static DBusMessage *set_discoverable_timeout(DBusConnection *conn,
bdaddr_t bdaddr;
const char *path;
- if (adapter->timeout_id) {
- g_source_remove(adapter->timeout_id);
- adapter->timeout_id = 0;
+ if (adapter->discov_timeout_id) {
+ g_source_remove(adapter->discov_timeout_id);
+ adapter->discov_timeout_id = 0;
}
if ((timeout != 0) && (adapter->scan_enable & SCAN_INQUIRY))
- adapter->timeout_id = g_timeout_add(timeout * 1000,
+ adapter->discov_timeout_id = g_timeout_add(timeout * 1000,
discov_timeout_handler,
adapter);
@@ -2423,9 +2423,9 @@ int adapter_stop(struct adapter *adapter)
const char *mode = "off";
/* cancel pending timeout */
- if (adapter->timeout_id) {
- g_source_remove(adapter->timeout_id);
- adapter->timeout_id = 0;
+ if (adapter->discov_timeout_id) {
+ g_source_remove(adapter->discov_timeout_id);
+ adapter->discov_timeout_id = 0;
}
/* check pending requests */
@@ -2592,3 +2592,76 @@ void adapter_free(struct adapter *adapter)
return;
}
+gboolean discov_timeout_handler(void *data)
+{
+ struct adapter *adapter = data;
+ struct hci_request rq;
+ int dd;
+ uint8_t scan_enable = adapter->scan_enable;
+ uint8_t status = 0;
+ gboolean retval = TRUE;
+ uint16_t dev_id = adapter->dev_id;
+
+ scan_enable &= ~SCAN_INQUIRY;
+
+ dd = hci_open_dev(dev_id);
+ if (dd < 0) {
+ error("HCI device open failed: hci%d", dev_id);
+ return TRUE;
+ }
+
+ memset(&rq, 0, sizeof(rq));
+ rq.ogf = OGF_HOST_CTL;
+ rq.ocf = OCF_WRITE_SCAN_ENABLE;
+ rq.cparam = &scan_enable;
+ rq.clen = sizeof(scan_enable);
+ rq.rparam = &status;
+ rq.rlen = sizeof(status);
+ rq.event = EVT_CMD_COMPLETE;
+
+ if (hci_send_req(dd, &rq, 1000) < 0) {
+ error("Sending write scan enable command to hci%d failed: %s (%d)",
+ dev_id, strerror(errno), errno);
+ goto failed;
+ }
+ if (status) {
+ error("Setting scan enable failed with status 0x%02x", status);
+ goto failed;
+ }
+
+ set_limited_discoverable(dd, adapter->dev.class, FALSE);
+
+ adapter_remove_discov_timeout(adapter);
+ retval = FALSE;
+
+failed:
+ if (dd >= 0)
+ hci_close_dev(dd);
+
+ return retval;
+}
+
+void adapter_set_discov_timeout(struct adapter *adapter, guint interval)
+{
+ if (!adapter)
+ return;
+
+ if (adapter->discov_timeout_id) {
+ error("Timeout already added for adapter %s", adapter->path);
+ return;
+ }
+
+ adapter->discov_timeout_id = g_timeout_add(interval, discov_timeout_handler, adapter);
+}
+
+void adapter_remove_discov_timeout(struct adapter *adapter)
+{
+ if (!adapter)
+ return;
+
+ if(adapter->discov_timeout_id == 0)
+ return;
+
+ g_source_remove(adapter->discov_timeout_id);
+ adapter->discov_timeout_id = 0;
+}
diff --git a/hcid/adapter.h b/hcid/adapter.h
index d27f85ef..98eaf8fe 100644
--- a/hcid/adapter.h
+++ b/hcid/adapter.h
@@ -103,7 +103,7 @@ struct adapter {
int up;
char *path; /* adapter object path */
char address[18]; /* adapter Bluetooth Address */
- guint timeout_id; /* discoverable timeout id */
+ guint discov_timeout_id; /* discoverable timeout id */
uint32_t discov_timeout; /* discoverable time(msec) */
uint8_t scan_enable; /* scan mode: SCAN_DISABLED, SCAN_PAGE, SCAN_INQUIRY */
uint8_t mode; /* off, connectable, discoverable, limited */
@@ -179,3 +179,5 @@ uint16_t adapter_get_dev_id(struct adapter *adapter);
const gchar *adapter_get_path(struct adapter *adapter);
const gchar *adapter_get_address(struct adapter *adapter);
void adapter_free(struct adapter *adapter);
+void adapter_set_discov_timeout(struct adapter *adapter, guint interval);
+void adapter_remove_discov_timeout(struct adapter *adapter);
diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c
index f03b2a85..f4e5b884 100644
--- a/hcid/dbus-hci.c
+++ b/hcid/dbus-hci.c
@@ -280,8 +280,7 @@ static void adapter_mode_changed(struct adapter *adapter, uint8_t scan_enable)
case (SCAN_PAGE | SCAN_INQUIRY):
if (adapter->discov_timeout != 0)
- adapter->timeout_id = g_timeout_add(adapter->discov_timeout * 1000,
- discov_timeout_handler, adapter);
+ adapter_set_discov_timeout(adapter, adapter->discov_timeout * 1000);
if (adapter->mode == MODE_LIMITED) {
mode = "limited";
@@ -293,8 +292,8 @@ static void adapter_mode_changed(struct adapter *adapter, uint8_t scan_enable)
case SCAN_INQUIRY:
/* Address the scenario where another app changed the scan mode */
if (adapter->discov_timeout != 0)
- adapter->timeout_id = g_timeout_add(adapter->discov_timeout * 1000,
- discov_timeout_handler, adapter);
+ adapter_set_discov_timeout(adapter, adapter->discov_timeout * 1000);
+
/* ignore, this event should not be sent*/
default:
/* ignore, reserved */
@@ -1594,55 +1593,6 @@ int set_service_classes(int dd, const uint8_t *cls, uint8_t value)
return 0;
}
-gboolean discov_timeout_handler(void *data)
-{
- struct adapter *adapter = data;
- struct hci_request rq;
- int dd;
- uint8_t scan_enable = adapter->scan_enable;
- uint8_t status = 0;
- gboolean retval = TRUE;
- uint16_t dev_id = adapter_get_dev_id(adapter);
-
- scan_enable &= ~SCAN_INQUIRY;
-
- dd = hci_open_dev(dev_id);
- if (dd < 0) {
- error("HCI device open failed: hci%d", dev_id);
- return TRUE;
- }
-
- memset(&rq, 0, sizeof(rq));
- rq.ogf = OGF_HOST_CTL;
- rq.ocf = OCF_WRITE_SCAN_ENABLE;
- rq.cparam = &scan_enable;
- rq.clen = sizeof(scan_enable);
- rq.rparam = &status;
- rq.rlen = sizeof(status);
- rq.event = EVT_CMD_COMPLETE;
-
- if (hci_send_req(dd, &rq, 1000) < 0) {
- error("Sending write scan enable command to hci%d failed: %s (%d)",
- dev_id, strerror(errno), errno);
- goto failed;
- }
- if (status) {
- error("Setting scan enable failed with status 0x%02x", status);
- goto failed;
- }
-
- set_limited_discoverable(dd, adapter->dev.class, FALSE);
-
- adapter->timeout_id = 0;
- retval = FALSE;
-
-failed:
- if (dd >= 0)
- hci_close_dev(dd);
-
- return retval;
-}
-
/* Section reserved to device HCI callbacks */
void hcid_dbus_setname_complete(bdaddr_t *local)
@@ -1731,10 +1681,7 @@ void hcid_dbus_setscan_enable_complete(bdaddr_t *local)
goto failed;
}
- if (adapter->timeout_id) {
- g_source_remove(adapter->timeout_id);
- adapter->timeout_id = 0;
- }
+ adapter_remove_discov_timeout(adapter);
if (adapter->scan_enable != rp.enable)
adapter_mode_changed(adapter, rp.enable);
generated by cgit (git 2.34.1) at 2025-10-31 21:42:53 +0000