Linux bluetooth development
 help / color / mirror / Atom feed
From: Michael Janssen <jamuraa@chromium.org>
To: linux-bluetooth@vger.kernel.org
Cc: Michael Janssen <jamuraa@chromium.org>
Subject: [PATCH BlueZ 2/5] attrib: Remove MTU-probing code
Date: Thu, 23 Oct 2014 09:33:26 -0700	[thread overview]
Message-ID: <1414082009-40903-3-git-send-email-jamuraa@chromium.org> (raw)
In-Reply-To: <1414082009-40903-1-git-send-email-jamuraa@chromium.org>

Probing for the MTU using bt_io is problematic for
testing because you cannot impersonate AF_BLUETOOTH sockets
with a socketpair.
---
 attrib/gattrib.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/attrib/gattrib.c b/attrib/gattrib.c
index 71d1cef..fa41ade 100644
--- a/attrib/gattrib.c
+++ b/attrib/gattrib.c
@@ -476,27 +476,17 @@ done:
 GAttrib *g_attrib_new(GIOChannel *io)
 {
 	struct _GAttrib *attrib;
-	uint16_t imtu;
 	uint16_t att_mtu;
 	uint16_t cid;
-	GError *gerr = NULL;
 
 	g_io_channel_set_encoding(io, NULL, NULL);
 	g_io_channel_set_buffered(io, FALSE);
 
-	bt_io_get(io, &gerr, BT_IO_OPT_IMTU, &imtu,
-				BT_IO_OPT_CID, &cid, BT_IO_OPT_INVALID);
-	if (gerr) {
-		error("%s", gerr->message);
-		g_error_free(gerr);
-		return NULL;
-	}
-
 	attrib = g_try_new0(struct _GAttrib, 1);
 	if (attrib == NULL)
 		return NULL;
 
-	att_mtu = (cid == ATT_CID) ? ATT_DEFAULT_LE_MTU : imtu;
+	att_mtu = ATT_DEFAULT_LE_MTU;
 
 	attrib->buf = g_malloc0(att_mtu);
 	attrib->buflen = att_mtu;
@@ -651,7 +641,6 @@ gboolean g_attrib_cancel_all(GAttrib *attrib)
 	return ret;
 }
 
-
 uint8_t *g_attrib_get_buffer(GAttrib *attrib, size_t *len)
 {
 	if (len == NULL)
-- 
2.1.0.rc2.206.gedb03e5


  parent reply	other threads:[~2014-10-23 16:33 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-23 16:33 [PATCH BlueZ 0/5] Unit tests for GAttrib Michael Janssen
2014-10-23 16:33 ` [PATCH BlueZ 1/5] Remove unused g_attrib_set_debug function Michael Janssen
2014-10-23 16:33 ` Michael Janssen [this message]
2014-10-23 16:33 ` [PATCH BlueZ 3/5] attrib: Add mtu argument to g_attrib_new Michael Janssen
2014-10-23 16:33 ` [PATCH BlueZ 4/5] attrib: remove g_attrib_is_encrypted Michael Janssen
2014-10-23 16:33 ` [PATCH BlueZ 5/5] Add unit test for gattrib Michael Janssen
2014-10-23 17:50 ` [PATCH BlueZ 0/5] Unit tests for GAttrib Michael Janssen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1414082009-40903-3-git-send-email-jamuraa@chromium.org \
    --to=jamuraa@chromium.org \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox