Commit 5d21cb70 authored Jun 17, 2013 by Erik Hugne Committed by David S. Miller Jun 17, 2013

tipc: allow implicit connect for stream sockets



TIPC's implied connect feature, aka piggyback connect, allows
applications to save one syscall and all SYN/SYN-ACK signalling
overhead when setting up a connection.  Until now, this has only
been supported for SEQPACKET sockets.  Here, we make it possible
to use this feature even with stream sockets.

At the connecting side, the connection is completed when the
first data message arrives from the accepting peer.  This means
that we must allow the connecting user to call blocking recv()
before the socket has reached state SS_CONNECTED.  So we must must
relax the state machine check at recv_stream(), and allow the
recv() call even if socket is in state SS_CONNECTING.

Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent cc79dd1b

net/tipc/socket.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -518,8 +518,7 @@ static int send_msg(struct kiocb iocb, struct socket sock,
	res = -EISCONN;		res = -EISCONN;
	goto exit;		goto exit;
	}		}
	if ((tport->published) \|\|		if (tport->published) {
	((sock->type == SOCK_STREAM) && (total_len != 0))) {
	res = -EOPNOTSUPP;		res = -EOPNOTSUPP;
	goto exit;		goto exit;
	}		}
	@@ -1010,8 +1009,7 @@ static int recv_stream(struct kiocb iocb, struct socket sock,

	lock_sock(sk);		lock_sock(sk);

	if (unlikely((sock->state == SS_UNCONNECTED) \|\|		if (unlikely((sock->state == SS_UNCONNECTED))) {
	(sock->state == SS_CONNECTING))) {
	res = -ENOTCONN;		res = -ENOTCONN;
	goto exit;		goto exit;
	}		}

Admin message