From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx> --- .gitignore | 2 ++ unit/test-avrcp.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 89 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7a2af5a..0a66fec 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,5 @@ android/bluetoothd-snoop android/test-ipc android/test-*.log android/test-*.trs + +patches/ diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c index 5b259bd..32b48b9 100644 --- a/unit/test-avrcp.c +++ b/unit/test-avrcp.c @@ -46,6 +46,7 @@ struct test_pdu { bool valid; bool fragmented; + bool browse; const uint8_t *data; size_t size; }; @@ -59,8 +60,10 @@ struct context { GMainLoop *main_loop; struct avrcp *session; guint source; + guint browse_source; guint process; int fd; + int browse_fd; unsigned int pdu_offset; const struct test_data *data; }; @@ -74,6 +77,14 @@ struct context { .size = sizeof(data(args)), \ } +#define brs_pdu(args...) \ + { \ + .valid = true, \ + .browse = true, \ + .data = data(args), \ + .size = sizeof(data(args)), \ + } + #define frg_pdu(args...) \ { \ .valid = true, \ @@ -129,7 +140,10 @@ static gboolean send_pdu(gpointer user_data) pdu = &context->data->pdu_list[context->pdu_offset++]; - len = write(context->fd, pdu->data, pdu->size); + if (pdu->browse) + len = write(context->browse_fd, pdu->data, pdu->size); + else + len = write(context->fd, pdu->data, pdu->size); if (g_test_verbose()) util_hexdump('<', pdu->data, len, test_debug, "AVRCP: "); @@ -162,6 +176,8 @@ static gboolean test_handler(GIOChannel *channel, GIOCondition cond, ssize_t len; int fd; + DBG(""); + pdu = &context->data->pdu_list[context->pdu_offset++]; if (cond & (G_IO_NVAL | G_IO_ERR | G_IO_HUP)) { @@ -189,17 +205,59 @@ static gboolean test_handler(GIOChannel *channel, GIOCondition cond, return TRUE; } +static gboolean browse_test_handler(GIOChannel *channel, GIOCondition cond, + gpointer user_data) +{ + struct context *context = user_data; + const struct test_pdu *pdu; + unsigned char buf[512]; + ssize_t len; + int fd; + + DBG(""); + + pdu = &context->data->pdu_list[context->pdu_offset++]; + + if (cond & (G_IO_NVAL | G_IO_ERR | G_IO_HUP)) { + context->browse_source = 0; + g_print("%s: cond %x\n", __func__, cond); + return FALSE; + } + + fd = g_io_channel_unix_get_fd(channel); + + len = read(fd, buf, sizeof(buf)); + + g_assert(len > 0); + + if (g_test_verbose()) + util_hexdump('>', buf, len, test_debug, "AVCTP: "); + + g_assert_cmpint(len, ==, pdu->size); + + g_assert(memcmp(buf, pdu->data, pdu->size) == 0); + + if (!pdu->fragmented) + context_process(context); + + return TRUE; +} + static struct context *create_context(uint16_t version, gconstpointer data) { struct context *context = g_new0(struct context, 1); GIOChannel *channel; int err, sv[2]; + DBG(""); + context->main_loop = g_main_loop_new(NULL, FALSE); g_assert(context->main_loop); + /* Control channel setup */ + err = socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sv); - g_assert(err == 0); + g_assert(!err); context->session = avrcp_new(sv[0], 672, 672, version); g_assert(context->session != NULL); @@ -218,6 +276,30 @@ static struct context *create_context(uint16_t version, gconstpointer data) g_io_channel_unref(channel); context->fd = sv[1]; + + /* Browsing channel setup */ + + err = socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sv); + g_assert(!err); + + err = avrcp_connect_browsing(context->session, sv[0], 672, 672); + g_assert(!err); + + channel = g_io_channel_unix_new(sv[1]); + + g_io_channel_set_close_on_unref(channel, TRUE); + g_io_channel_set_encoding(channel, NULL, NULL); + g_io_channel_set_buffered(channel, FALSE); + + context->browse_source = g_io_add_watch(channel, + G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL, + browse_test_handler, context); + g_assert(context->browse_source > 0); + + g_io_channel_unref(channel); + + context->browse_fd = sv[1]; + context->data = data; return context; @@ -230,6 +312,9 @@ static void destroy_context(struct context *context) avrcp_shutdown(context->session); + if (context->browse_source > 0) + g_source_remove(context->browse_source); + g_main_loop_unref(context->main_loop); test_free(context->data); -- 1.8.3.2 -- 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