Hi Marcin,
On Friday 27 of February 2015 09:01:12 Marcin Kraglak wrote:
> Accept incoming connection to Control Channel in case of colission.
> If accepting connection won't succeed, try reconnect.
> There is no need to request authorization while user has been connecting
> to service in meantime.
> Issue was found during tests with NOKIA BH-505 and Motorola HT-820.
> ---
> profiles/audio/avctp.c | 38 ++++++++++++++++++++++++++++++++++++--
> 1 file changed, 36 insertions(+), 2 deletions(-)
>
> diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
> index 57071b5..8d457f4 100644
> --- a/profiles/audio/avctp.c
> +++ b/profiles/audio/avctp.c
> @@ -203,6 +203,7 @@ struct avctp {
> uint8_t key_quirks[256];
> struct key_pressed key;
> bool initiator;
> + bool reconnect;
> };
>
> struct avctp_passthrough_handler {
> @@ -1219,11 +1220,22 @@ static void avctp_connect_cb(GIOChannel *chan, GError *err, gpointer data)
> GError *gerr = NULL;
>
> if (err) {
> + struct btd_device *device = session->device;
> + bool reconnect = session->reconnect;
> +
> avctp_set_state(session, AVCTP_STATE_DISCONNECTED);
> error("%s", err->message);
> +
> + if (!reconnect)
> + return;
> +
> + DBG("Control: Attempting to reconnect");
> + avctp_connect(device);
> return;
> }
>
> + session->reconnect = false;
> +
> bt_io_get(chan, &gerr,
> BT_IO_OPT_DEST, &address,
> BT_IO_OPT_IMTU, &imtu,
> @@ -1346,10 +1358,32 @@ static void avctp_control_confirm(struct avctp *session, GIOChannel *chan,
> {
> const bdaddr_t *src;
> const bdaddr_t *dst;
> + GError *err = NULL;
>
> if (session->control != NULL) {
> - error("Control: Refusing unexpected connect");
> - g_io_channel_shutdown(chan, TRUE, NULL);
> + if (session->state != AVCTP_STATE_CONNECTING) {
> + error("Control: Refusing unexpected connect");
> + g_io_channel_shutdown(chan, TRUE, NULL);
> + return;
> + }
> +
> + /* Cancel outgoing connection and accept incoming */
> + DBG("Control: Accepting unexpected connect from remote");
> + g_io_channel_shutdown(session->control->io, TRUE, NULL);
> + g_io_channel_unref(session->control->io);
> + session->control->io = NULL;
> +
> + if (!bt_io_accept(chan, avctp_connect_cb, session, NULL,
> + &err)) {
> + error("bt_io_accept: %s", err->message);
> + g_error_free(err);
> + avctp_set_state(session, AVCTP_STATE_DISCONNECTED);
> + return;
> + }
> +
> + session->reconnect = true;
> + session->control->io = g_io_channel_ref(chan);
> +
> return;
> }
I think we should go with random timer as required by AVRCP specification
p.4.1.1:
"If both devices open an AVCTP channel at the same time both channels shall be
closed and each device shall wait a random time (not more than 1 s and not less
than 100ms) and then try to open the AVCTP channel again. If it is known which
device is the master that device can re-try at once."
--
Best regards,
Szymon Janc
--
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
