diff options
| author | Michael Janssen <jamuraa@chromium.org> | 2014-10-31 11:14:52 -0700 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-11-03 17:16:56 +0200 |
| commit | 566488510e0e8216a26e93c3422a36f560c380e1 (patch) | |
| tree | 2e986cdd39adc7aad275d5323d4570132b9748b1 /attrib | |
| parent | 49f13e083d1458582c983f768fbc9ff0fe2a14b0 (diff) | |
| download | bluez-566488510e0e8216a26e93c3422a36f560c380e1.tar.gz | |
attrib: Add mtu argument to g_attrib_new
Instead of using the default MTU, use one passed
in by the user, and detect it from the channel when
it is created.
Diffstat (limited to 'attrib')
| -rw-r--r-- | attrib/gattrib.c | 9 | ||||
| -rw-r--r-- | attrib/gattrib.h | 2 | ||||
| -rw-r--r-- | attrib/gatttool.c | 18 | ||||
| -rw-r--r-- | attrib/interactive.c | 17 |
4 files changed, 37 insertions, 9 deletions
diff --git a/attrib/gattrib.c b/attrib/gattrib.c index ba2f6cca2..a6511a2ab 100644 --- a/attrib/gattrib.c +++ b/attrib/gattrib.c @@ -473,10 +473,9 @@ done: return TRUE; } -GAttrib *g_attrib_new(GIOChannel *io) +GAttrib *g_attrib_new(GIOChannel *io, guint16 mtu) { struct _GAttrib *attrib; - uint16_t att_mtu; g_io_channel_set_encoding(io, NULL, NULL); g_io_channel_set_buffered(io, FALSE); @@ -485,10 +484,8 @@ GAttrib *g_attrib_new(GIOChannel *io) if (attrib == NULL) return NULL; - att_mtu = ATT_DEFAULT_LE_MTU; - - attrib->buf = g_malloc0(att_mtu); - attrib->buflen = att_mtu; + attrib->buf = g_malloc0(mtu); + attrib->buflen = mtu; attrib->io = g_io_channel_ref(io); attrib->requests = g_queue_new(); diff --git a/attrib/gattrib.h b/attrib/gattrib.h index 18df2ade4..99b8b375d 100644 --- a/attrib/gattrib.h +++ b/attrib/gattrib.h @@ -42,7 +42,7 @@ typedef void (*GAttribDebugFunc)(const char *str, gpointer user_data); typedef void (*GAttribNotifyFunc)(const guint8 *pdu, guint16 len, gpointer user_data); -GAttrib *g_attrib_new(GIOChannel *io); +GAttrib *g_attrib_new(GIOChannel *io, guint16 mtu); GAttrib *g_attrib_ref(GAttrib *attrib); void g_attrib_unref(GAttrib *attrib); diff --git a/attrib/gatttool.c b/attrib/gatttool.c index db5da6220..b8e0f680d 100644 --- a/attrib/gatttool.c +++ b/attrib/gatttool.c @@ -123,6 +123,9 @@ static gboolean listen_start(gpointer user_data) static void connect_cb(GIOChannel *io, GError *err, gpointer user_data) { GAttrib *attrib; + uint16_t mtu; + uint16_t cid; + GError *gerr = NULL; if (err) { g_printerr("%s\n", err->message); @@ -130,7 +133,20 @@ static void connect_cb(GIOChannel *io, GError *err, gpointer user_data) g_main_loop_quit(event_loop); } - attrib = g_attrib_new(io); + bt_io_get(io, &gerr, BT_IO_OPT_IMTU, &mtu, + BT_IO_OPT_CID, &cid, BT_IO_OPT_INVALID); + + if (gerr) { + g_printerr("Can't detect MTU, using default: %s", + gerr->message); + g_error_free(gerr); + mtu = ATT_DEFAULT_LE_MTU; + } + + if (cid == ATT_CID) + mtu = ATT_DEFAULT_LE_MTU; + + attrib = g_attrib_new(io, mtu); if (opt_listen) g_idle_add(listen_start, attrib); diff --git a/attrib/interactive.c b/attrib/interactive.c index 08f39f73b..7911ba543 100644 --- a/attrib/interactive.c +++ b/attrib/interactive.c @@ -150,13 +150,28 @@ static void events_handler(const uint8_t *pdu, uint16_t len, gpointer user_data) static void connect_cb(GIOChannel *io, GError *err, gpointer user_data) { + uint16_t mtu; + uint16_t cid; + if (err) { set_state(STATE_DISCONNECTED); error("%s\n", err->message); return; } - attrib = g_attrib_new(iochannel); + bt_io_get(io, &err, BT_IO_OPT_IMTU, &mtu, + BT_IO_OPT_CID, &cid, BT_IO_OPT_INVALID); + + if (err) { + g_printerr("Can't detect MTU, using default: %s", err->message); + g_error_free(err); + mtu = ATT_DEFAULT_LE_MTU; + } + + if (cid == ATT_CID) + mtu = ATT_DEFAULT_LE_MTU; + + attrib = g_attrib_new(iochannel, mtu); g_attrib_register(attrib, ATT_OP_HANDLE_NOTIFY, GATTRIB_ALL_HANDLES, events_handler, attrib, NULL); g_attrib_register(attrib, ATT_OP_HANDLE_IND, GATTRIB_ALL_HANDLES, |