Open Source Telephony
 help / color / mirror / Atom feed
From: Vinicius Costa Gomes <vcgomes@gmail.com>
To: ofono@ofono.org
Subject: [PATCH 5/7] handsfree-audio: Fix keeping the socket open without defer_setup
Date: Tue, 10 Sep 2013 21:09:44 -0300	[thread overview]
Message-ID: <1378858186-683-5-git-send-email-vcgomes@gmail.com> (raw)
In-Reply-To: <1378858186-683-1-git-send-email-vcgomes@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 753 bytes --]

As we won't allow any card to be registered when the kernel doesn't
support defer_setup, we don't need to have the listening SCO socket
open in this case.
---
 src/handsfree-audio.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/handsfree-audio.c b/src/handsfree-audio.c
index 4d2c21f..a1d9714 100644
--- a/src/handsfree-audio.c
+++ b/src/handsfree-audio.c
@@ -214,9 +214,12 @@ static int sco_init(void)
 
 	if (setsockopt(sk, SOL_BLUETOOTH, BT_DEFER_SETUP,
 				&defer_setup, sizeof(defer_setup)) < 0) {
+		int err = -errno;
 		defer_setup = 0;
 		ofono_warn("Can't enable deferred setup: %s (%d)",
 						strerror(errno), errno);
+		close(sk);
+		return err;
 	}
 
 	memset(&voice, 0, sizeof(voice));
-- 
1.8.4


  parent reply	other threads:[~2013-09-11  0:09 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-11  0:09 [PATCH 1/7] handsfree-audio: Add setting SCO air mode Vinicius Costa Gomes
2013-09-11  0:09 ` [PATCH 2/7] handsfree-audio: Add support for detecting Transparent SCO support Vinicius Costa Gomes
2013-09-12 18:20   ` Denis Kenzior
2013-09-11  0:09 ` [PATCH 3/7] handsfree-audio: Set the voice setting for outgoing connections Vinicius Costa Gomes
2013-09-11  0:09 ` [PATCH 4/7] handsfree-audio: Do not allow cards to be registered if no defer_setup Vinicius Costa Gomes
2013-09-11  0:09 ` Vinicius Costa Gomes [this message]
2013-09-11  0:09 ` [PATCH 6/7] hfp_hf_bluez5: Handle org.bluez.Profile1.Cancel() Vinicius Costa Gomes
2013-09-12 18:21   ` Denis Kenzior
2013-09-11  0:09 ` [PATCH 7/7] hfp_hf_bluez5: Handle org.bluez.Profile1.Release() Vinicius Costa Gomes
2013-09-12 18:21   ` Denis Kenzior
2013-09-12 18:19 ` [PATCH 1/7] handsfree-audio: Add setting SCO air mode Denis Kenzior
2013-09-12 20:09   ` =?unknown-8bit?q?Vin=C3=ADcius?= Costa Gomes

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=1378858186-683-5-git-send-email-vcgomes@gmail.com \
    --to=vcgomes@gmail.com \
    --cc=ofono@ofono.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