diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2006-06-26 02:44:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-06-26 02:44:57 -0400 |
commit | 3388007bc4d662e50c2c01a7fb1fa2c31cea98ad (patch) | |
tree | 9971f7cb08c6d20485db861a36604bdafe1019e2 | |
parent | 6b384de853c9f05e5e6da6c95edb475b96dd2cc1 (diff) |
[TIPC]: Implied connect now saves dest name for retrieval as ancillary data.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/tipc/socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 758b2d2d2f9c..98550b90a730 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -470,6 +470,10 @@ static int send_msg(struct kiocb *iocb, struct socket *sock, | |||
470 | if ((tsock->p->published) || | 470 | if ((tsock->p->published) || |
471 | ((sock->type == SOCK_STREAM) && (total_len != 0))) | 471 | ((sock->type == SOCK_STREAM) && (total_len != 0))) |
472 | return -EOPNOTSUPP; | 472 | return -EOPNOTSUPP; |
473 | if (dest->addrtype == TIPC_ADDR_NAME) { | ||
474 | tsock->p->conn_type = dest->addr.name.name.type; | ||
475 | tsock->p->conn_instance = dest->addr.name.name.instance; | ||
476 | } | ||
473 | } | 477 | } |
474 | 478 | ||
475 | if (down_interruptible(&tsock->sem)) | 479 | if (down_interruptible(&tsock->sem)) |
@@ -1269,10 +1273,6 @@ static int connect(struct socket *sock, struct sockaddr *dest, int destlen, | |||
1269 | msg = buf_msg(buf); | 1273 | msg = buf_msg(buf); |
1270 | res = auto_connect(sock, tsock, msg); | 1274 | res = auto_connect(sock, tsock, msg); |
1271 | if (!res) { | 1275 | if (!res) { |
1272 | if (dst->addrtype == TIPC_ADDR_NAME) { | ||
1273 | tsock->p->conn_type = dst->addr.name.name.type; | ||
1274 | tsock->p->conn_instance = dst->addr.name.name.instance; | ||
1275 | } | ||
1276 | if (!msg_data_sz(msg)) | 1276 | if (!msg_data_sz(msg)) |
1277 | advance_queue(tsock); | 1277 | advance_queue(tsock); |
1278 | } | 1278 | } |