Re: [Bluez-devel] socket connect returns EAGAIN

["Ulisses Furquim" <ulissesf@gmail.com>]

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

On 9/21/06, Marcel Holtmann <marcel@holtmann.org> wrote:
> Hi Ulisses,
>
> > > what about the server socket. In this case EAGAIN is fine.
> >
> > Yes, in this case EAGAIN is fine. However, I don't think we are even
> > calling bt_sock_wait_state() for a server socket (please, correct me
> > if I'm wrong) so changing EAGAIN to EINPROGRESS inside
> > bt_sock_wait_state() should just work, right? (we just  need to fix
> > rfcomm_session_create() too and that's it).
>
> looks like it is okay, care to send a patch.

Here is the patch. I'm running 2.6.18-mh1 plus the attached patch and
I have no problems so far (but it needs more testing so we can be sure
everything works).

Regards,

-- Ulisses

[-- Attachment #2: eagain-to-einprogress.patch --]
[-- Type: text/x-patch, Size: 862 bytes --]

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 788ea7a..305a099 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -276,7 +276,7 @@ int bt_sock_wait_state(struct sock *sk, 
 		set_current_state(TASK_INTERRUPTIBLE);
 
 		if (!timeo) {
-			err = -EAGAIN;
+			err = -EINPROGRESS;
 			break;
 		}
 
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 332dd8f..468df3b 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -644,7 +644,7 @@ static struct rfcomm_session *rfcomm_ses
 	addr.l2_family = AF_BLUETOOTH;
 	addr.l2_psm    = htobs(RFCOMM_PSM);
 	*err = sock->ops->connect(sock, (struct sockaddr *) &addr, sizeof(addr), O_NONBLOCK);
-	if (*err == 0 || *err == -EAGAIN)
+	if (*err == 0 || *err == -EINPROGRESS)
 		return s;
 
 	rfcomm_session_del(s);

[-- Attachment #3: Type: text/plain, Size: 348 bytes --]

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

[-- Attachment #4: Type: text/plain, Size: 164 bytes --]

_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel