From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCHv10 1/4] android/socket: Use security level for connect / listen
Date: Mon, 25 Nov 2013 16:10:22 +0200 [thread overview]
Message-ID: <1385388625-3156-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <20131125134005.GB19445@x220.p-661hnu-f1>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Use MEDIUM security level for connections without profile and default
sec_level for others. rfsock now has pointer to profile info.
---
android/socket.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/android/socket.c b/android/socket.c
index 83e6996..e31e391 100644
--- a/android/socket.c
+++ b/android/socket.c
@@ -60,6 +60,8 @@ GList *servers = NULL;
/* Simple list of RFCOMM connected sockets */
GList *connections = NULL;
+struct profile_info;
+
struct rfcomm_sock {
int fd; /* descriptor for communication with Java framework */
int real_sock; /* real RFCOMM socket */
@@ -70,6 +72,8 @@ struct rfcomm_sock {
bdaddr_t dst;
uint32_t service_handle;
+
+ struct profile_info *profile;
};
static struct rfcomm_sock *create_rfsock(int sock, int *hal_fd)
@@ -667,7 +671,7 @@ static int handle_listen(void *buf)
return -1;
else {
chan = cmd->channel;
- sec_level = BT_IO_SEC_LOW;
+ sec_level = BT_IO_SEC_MEDIUM;
}
} else {
chan = profile->channel;
@@ -786,6 +790,7 @@ fail:
static void sdp_search_cb(sdp_list_t *recs, int err, gpointer data)
{
struct rfcomm_sock *rfsock = data;
+ BtIOSecLevel sec_level = BT_IO_SEC_MEDIUM;
GError *gerr = NULL;
sdp_list_t *list;
GIOChannel *io;
@@ -829,11 +834,14 @@ static void sdp_search_cb(sdp_list_t *recs, int err, gpointer data)
DBG("Got RFCOMM channel %d", chan);
+ if (rfsock->profile)
+ sec_level = rfsock->profile->sec_level;
+
io = bt_io_connect(connect_cb, rfsock, NULL, &gerr,
BT_IO_OPT_SOURCE_BDADDR, &adapter_addr,
BT_IO_OPT_DEST_BDADDR, &rfsock->dst,
BT_IO_OPT_CHANNEL, chan,
- BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
+ BT_IO_OPT_SEC_LEVEL, sec_level,
BT_IO_OPT_INVALID);
if (!io) {
error("Failed connect: %s", gerr->message);
@@ -875,6 +883,8 @@ static int handle_connect(void *buf)
uuid.type = SDP_UUID128;
memcpy(&uuid.value.uuid128, cmd->uuid, sizeof(uint128_t));
+ rfsock->profile = get_profile_by_uuid(cmd->uuid);
+
if (bt_search_service(&adapter_addr, &dst, &uuid, sdp_search_cb, rfsock,
NULL) < 0) {
error("Failed to search SDP records");
--
1.8.3.2
next prev parent reply other threads:[~2013-11-25 14:10 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-25 13:08 [PATCHv9 00/21] Socket HAL Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 01/21] android/socket: Parse SDP response and connect Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 02/21] android/socket: Implement HAL connect call Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 03/21] android/socket: Send RFCOMM channel to framework Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 04/21] android/socket: Send connect signal to Android framework Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 05/21] android/socket: Close file descriptor after sending Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 06/21] android/socket: Add general service create/remove function Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 07/21] android/socket: Add OPP SDP record Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 08/21] android/socket: Add MAS uuid to profile table Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 09/21] android/socket: Add SPP " Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 10/21] android/socket: Add PBAP SDP record Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 11/21] android/socket: Add SPP " Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 12/21] android/socket: Support listen() with supplied chan number Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 13/21] android/hal-sock: Print bdaddr on connect Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 14/21] android/socket: Refactor socket send_fd function Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 15/21] android/hal-utils: Fix possible NULL pointer dereference Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 16/21] android/socket: Use default sec_level for listen Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 17/21] android/socket: Add error printing possible close() failure Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 18/21] android/socket: Use security level for connect Andrei Emeltchenko
2013-11-25 13:40 ` Johan Hedberg
2013-11-25 14:10 ` Andrei Emeltchenko [this message]
2013-11-25 14:10 ` [PATCHv10 2/4] android/socket: Keep server iochannel reference Andrei Emeltchenko
2013-11-25 14:10 ` [PATCHv10 3/4] android/socket: Handle Android events for server socket Andrei Emeltchenko
2013-11-25 14:10 ` [PATCHv10 4/4] android/socket: Check create_rfsock returns valid structure Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 19/21] android/socket: Keep server iochannel reference Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 20/21] android/socket: Handle Android events for server socket Andrei Emeltchenko
2013-11-25 13:08 ` [PATCHv9 21/21] android/socket: Check create_rfsock returns valid structure Andrei Emeltchenko
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=1385388625-3156-1-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).