diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2006-03-10 19:37:21 +0000 |
|---|---|---|
| committer | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2006-03-10 19:37:21 +0000 |
| commit | 62bf14a7a2b1059ce37f342ba26933f187e0885c (patch) | |
| tree | 73e16f8f3f0f26035ed31aaf41fd0e52cd7f6635 /hcid/dbus-adapter.c | |
| parent | c455022aae4b9da5ccad1698f2b02b9b1f0ce22a (diff) | |
Added requestor unique name verification before cancel an inquiry process
Diffstat (limited to 'hcid/dbus-adapter.c')
| -rw-r--r-- | hcid/dbus-adapter.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c index 3c2a3300..984b7778 100644 --- a/hcid/dbus-adapter.c +++ b/hcid/dbus-adapter.c @@ -1129,6 +1129,7 @@ static DBusMessage *handle_dev_get_encryption_key_size_req(DBusMessage *msg, voi static DBusMessage *handle_dev_discover_devices_req(DBusMessage *msg, void *data) { DBusMessage *reply = NULL; + const char *requestor_name; inquiry_cp cp; evt_cmd_status rp; struct hci_request rq; @@ -1137,7 +1138,7 @@ static DBusMessage *handle_dev_discover_devices_req(DBusMessage *msg, void *data uint32_t lap = 0x9e8b33; int dd; - if (dbus_data->busy) + if (dbus_data->requestor_name) return error_discover_in_progress(msg); dd = hci_open_dev(dbus_data->dev_id); @@ -1167,6 +1168,9 @@ static DBusMessage *handle_dev_discover_devices_req(DBusMessage *msg, void *data goto failed; } + requestor_name = dbus_message_get_sender(msg); + dbus_data->requestor_name = strdup(requestor_name); + reply = dbus_message_new_method_return(msg); failed: @@ -1178,10 +1182,21 @@ failed: static DBusMessage *handle_dev_cancel_discovery_req(DBusMessage *msg, void *data) { DBusMessage *reply = NULL; + const char *requestor_name; struct hci_request rq; struct hci_dbus_data *dbus_data = data; uint8_t status; - int dd; + int dd = -1; + + requestor_name = dbus_message_get_sender(msg); + + /* is there discover pending? */ + if (!dbus_data->requestor_name) + return error_not_authorized(msg); + + /* only the discover requestor can cancel the inquiry process */ + if (strcmp(dbus_data->requestor_name, requestor_name)) + return error_not_authorized(msg); dd = hci_open_dev(dbus_data->dev_id); if (dd < 0) @@ -1206,6 +1221,9 @@ static DBusMessage *handle_dev_cancel_discovery_req(DBusMessage *msg, void *data goto failed; } + free(dbus_data->requestor_name); + dbus_data->requestor_name = NULL; + reply = dbus_message_new_method_return(msg); failed: |