Commit 3388007b authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

[TIPC]: Implied connect now saves dest name for retrieval as ancillary data. 



Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPer Liden <per.liden@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b384de8

net/tipc/socket.c

+4 −4
Original line number Diff line number Diff line
@@ -470,6 +470,10 @@ static int send_msg(struct kiocb *iocb, struct socket *sock, 
		if ((tsock->p->published) ||

		    ((sock->type == SOCK_STREAM) && (total_len != 0)))

			return -EOPNOTSUPP;

		if (dest->addrtype == TIPC_ADDR_NAME) {

			tsock->p->conn_type = dest->addr.name.name.type;

			tsock->p->conn_instance = dest->addr.name.name.instance;

		}

	}



	if (down_interruptible(&tsock->sem))
@@ -1269,10 +1273,6 @@ static int connect(struct socket *sock, struct sockaddr *dest, int destlen, 
	   msg = buf_msg(buf);

           res = auto_connect(sock, tsock, msg);

           if (!res) {

		   if (dst->addrtype == TIPC_ADDR_NAME) {

			   tsock->p->conn_type = dst->addr.name.name.type;

			   tsock->p->conn_instance = dst->addr.name.name.instance;

		   }

		   if (!msg_data_sz(msg))

			   advance_queue(tsock);

	   }