Hi Jakub,
> On Mon, Mar 23, 2015 at 12:31 PM, Jakub Pawlowski <jpawlowski@xxxxxxxxxx> wrote:
> This patch adds parameter parsing, and basic internal logic checks to
> SetDiscoveryFilter method.
> ---
> src/adapter.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 172 insertions(+)
>
> diff --git a/src/adapter.c b/src/adapter.c
> index 7c51399..f57b58c 100644
> --- a/src/adapter.c
> +++ b/src/adapter.c
> @@ -92,6 +92,8 @@
> #define SCAN_TYPE_LE ((1 << BDADDR_LE_PUBLIC) | (1 << BDADDR_LE_RANDOM))
> #define SCAN_TYPE_DUAL (SCAN_TYPE_BREDR | SCAN_TYPE_LE)
>
> +#define DISTNACE_VAL_INVALID 0x7FFF
s/DISTNACE/DISTANCE/
Also, where does the 0x7FFF come from? Why not just 0xFFFF?
> +
> static DBusConnection *dbus_conn = NULL;
>
> static bool kernel_conn_control = false;
> @@ -145,6 +147,13 @@ struct conn_param {
> uint16_t timeout;
> };
>
> +struct discovery_filter {
> + uint8_t type;
> + uint16_t pathloss;
> + int16_t rssi;
> + GSList *uuids;
> +};
> +
> struct watch_client {
> struct btd_adapter *adapter;
> char *owner;
> @@ -1760,9 +1769,172 @@ static DBusMessage *start_discovery(DBusConnection *conn,
> return dbus_message_new_method_return(msg);
> }
>
> +static bool parse_discovery_filter_entry(char *key, DBusMessageIter *value,
> + GSList **uuids, int16_t *rssi,
> + uint16_t *pathloss, uint8_t *transport)
> +{
> + uint8_t type;
> +
> + if (strcmp("UUIDs", key) == 0) {
Use "if (!strcmp("UUIDs"..." instead of "== 0".
> + DBusMessageIter arriter;
> +
> + if (dbus_message_iter_get_arg_type(value) != DBUS_TYPE_ARRAY)
> + return false;
New line after return.
> + dbus_message_iter_recurse(value, &arriter);
> + while ((type = dbus_message_iter_get_arg_type(&arriter)) !=
> + DBUS_TYPE_INVALID) {
> + char *uuid_str;
> + char *result_uuid;
> + uuid_t uuid_tmp;
I'd use bt_uuid_t here instead of uuid_t, since the latter is defined
for sdp specific usage. Though I'd check with the others here still.
> +
> + if (dbus_message_iter_get_arg_type(&arriter) !=
> + DBUS_TYPE_STRING)
> + return false;
> +
> + dbus_message_iter_get_basic(&arriter, &uuid_str);
> + if (bt_string2uuid(&uuid_tmp, uuid_str) < 0)
> + return false;
> +
> + result_uuid = bt_uuid2string(&uuid_tmp);
> +
> + *uuids = g_slist_prepend(*uuids, result_uuid);
> +
> + dbus_message_iter_next(&arriter);
Indentation looks off here. You should probably run checkpatch on
these for general formatting.
> + }
> + } else if (strcmp("RSSI", key) == 0) {
> + if (dbus_message_iter_get_arg_type(value) != DBUS_TYPE_INT16)
> + return false;
It makes code more readable if you add a new line after returns within a block.
> + dbus_message_iter_get_basic(value, rssi);
> + if (*rssi > 0 || *rssi < -127)
Why are positive RSSI values not allowed? doc/adapter.txt doesn't
provide the unit of measurement for RSSI but I assume it's dBm, which
can be positive, no? Eitherway, add a comment here explaining these
checks.
> + return false;
> + } else if (strcmp("Pathloss", key) == 0) {
> + if (dbus_message_iter_get_arg_type(value) != DBUS_TYPE_UINT16)
> + return false;
> + dbus_message_iter_get_basic(value, pathloss);
> + if (*pathloss > 127)
Add a comment here explaining why this is. Also it probably makes
sense to define a macro constant for 127.
> + return false;
> + } else if (strcmp("Transport", key) == 0) {
> + char *transport_str;
> +
> + if (dbus_message_iter_get_arg_type(value) != DBUS_TYPE_STRING)
> + return false;
> + dbus_message_iter_get_basic(value, &transport_str);
> +
> + if (strcmp(transport_str, "bredr") == 0)
> + *transport = SCAN_TYPE_BREDR;
> + else if (strcmp(transport_str, "le") == 0)
> + *transport = SCAN_TYPE_LE;
> + else if (strcmp(transport_str, "auto") == 0)
> + *transport = SCAN_TYPE_DUAL;
> + else
> + return false;
> + } else {
> + DBG("Unknown key parameter: %s!\n", key);
> + return false;
> + }
> +
> + return true;
> +}
> +
> +/* This method is responsible for parsing parameters to SetDiscoveryFilter. If
> + * filter in msg was empty, sets *filter to NULL. If whole parsing was
> + * successful, sets *filter to proper value.
> + * Returns false on any error, and true on success.
> + */
> +static bool parse_discovery_filter_dict(struct discovery_filter **filter,
> + DBusMessage *msg)
> +{
> + DBusMessageIter iter, subiter, dictiter, variantiter;
> + GSList *uuids = NULL;
> + uint16_t pathloss = DISTNACE_VAL_INVALID;
> + int16_t rssi = DISTNACE_VAL_INVALID;
s/DISTNACE/DISTANCE/
> + uint8_t transport = SCAN_TYPE_DUAL;
> + uint8_t is_empty = true;
bool is_empty;
> +
> + dbus_message_iter_init(msg, &iter);
> + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY ||
> + dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_DICT_ENTRY)
> + return false;
> +
> + dbus_message_iter_recurse(&iter, &subiter);
> + do {
> + int type = dbus_message_iter_get_arg_type(&subiter);
> +
> + if (type == DBUS_TYPE_INVALID)
> + break;
> +
> + if (type == DBUS_TYPE_DICT_ENTRY) {
This if statement is probably not needed since you checked above for
element_type.
> + char *key;
> +
> + is_empty = false;
> + dbus_message_iter_recurse(&subiter, &dictiter);
> +
> + dbus_message_iter_get_basic(&dictiter, &key);
> + if (!dbus_message_iter_next(&dictiter))
> + goto invalid_args;
> +
> + if (dbus_message_iter_get_arg_type(&dictiter) !=
> + DBUS_TYPE_VARIANT)
> + goto invalid_args;
> +
> + dbus_message_iter_recurse(&dictiter, &variantiter);
> +
> + if (!parse_discovery_filter_entry(key, &variantiter,
> + &uuids, &rssi, &pathloss,
> + &transport))
> + goto invalid_args;
> + }
> +
> + dbus_message_iter_next(&subiter);
> + } while (true);
> +
> + if (is_empty) {
> + *filter = NULL;
> + return true;
> + }
> +
> + /* only pathlos or rssi can be set, never both*/
Space before "*/"
> + if (pathloss != DISTNACE_VAL_INVALID && rssi != DISTNACE_VAL_INVALID)
s/DISTNACE/DISTANCE/
> + goto invalid_args;
> +
> + DBG("filtered discovery params: transport: %d rssi: %d pathloss: %d",
> + transport, rssi, pathloss);
> +
> + *filter = g_try_malloc(sizeof(**filter));
> + if (*filter == NULL) {
if (!*filter) {
> + g_slist_free_full(uuids, g_free);
> + return false;
> + }
> +
> + (*filter)->type = transport;
> + (*filter)->pathloss = pathloss;
> + (*filter)->rssi = rssi;
> + (*filter)->uuids = uuids;
> +
> + return true;
> +
> +invalid_args:
> + g_slist_free_full(uuids, g_free);
> + return false;
> +}
> +
> static DBusMessage *set_discovery_filter(DBusConnection *conn,
> DBusMessage *msg, void *user_data)
> {
> + struct btd_adapter *adapter = user_data;
> + struct discovery_filter *discovery_filter;
> +
> + const char *sender = dbus_message_get_sender(msg);
> +
> + DBG("sender %s", sender);
> +
> + if (!(adapter->current_settings & MGMT_SETTING_POWERED))
> + return btd_error_not_ready(msg);
> +
> + /* parse parameters */
> + if (!parse_discovery_filter_dict(&discovery_filter, msg))
> + return btd_error_invalid_args(msg);
> +
> return btd_error_failed(msg, "Not implemented yet");
This error is no longer valid, so shouldn't you return success here?
> }
>
> --
> 2.2.0.rc0.207.ga3a616c
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks,
Arman
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
