From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCHv9 19/21] android/socket: Keep server iochannel reference
Date: Mon, 25 Nov 2013 15:08:55 +0200 [thread overview]
Message-ID: <1385384937-29858-20-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1385384937-29858-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
server io channel reference will be stored in rfsock structure
and might be deleted when Android end closes connection or when
HAL makes cleanup() call.
---
android/socket.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/android/socket.c b/android/socket.c
index 6f2c498..93b3d48 100644
--- a/android/socket.c
+++ b/android/socket.c
@@ -70,6 +70,8 @@ struct rfcomm_sock {
guint rfcomm_watch;
guint stack_watch;
+ GIOChannel *srv_io;
+
bdaddr_t dst;
uint32_t service_handle;
@@ -121,6 +123,11 @@ static void cleanup_rfsock(struct rfcomm_sock *rfsock)
if (rfsock->service_handle)
bt_adapter_remove_record(rfsock->service_handle);
+ if (rfsock->srv_io) {
+ g_io_channel_shutdown(rfsock->srv_io, TRUE, NULL);
+ g_io_channel_unref(rfsock->srv_io);
+ }
+
g_free(rfsock);
}
@@ -699,9 +706,7 @@ static int handle_listen(void *buf)
rfsock->real_sock = g_io_channel_unix_get_fd(io);
servers = g_list_append(servers, rfsock);
- /* TODO: Add server watch */
- g_io_channel_set_close_on_unref(io, TRUE);
- g_io_channel_unref(io);
+ rfsock->srv_io = io;
DBG("real_sock %d fd %d hal_fd %d", rfsock->real_sock, rfsock->fd,
hal_fd);
--
1.8.3.2
next prev parent reply other threads:[~2013-11-25 13:08 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 ` [PATCHv10 1/4] android/socket: Use security level for connect / listen Andrei Emeltchenko
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 ` Andrei Emeltchenko [this message]
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=1385384937-29858-20-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).