Commit 3546c750 authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller

[TIPC]: Can now return destination name of form {0,x,y} via 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 3388007b
...@@ -731,6 +731,7 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg, ...@@ -731,6 +731,7 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg,
u32 anc_data[3]; u32 anc_data[3];
u32 err; u32 err;
u32 dest_type; u32 dest_type;
int has_name;
int res; int res;
if (likely(m->msg_controllen == 0)) if (likely(m->msg_controllen == 0))
...@@ -755,24 +756,27 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg, ...@@ -755,24 +756,27 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg,
dest_type = msg ? msg_type(msg) : TIPC_DIRECT_MSG; dest_type = msg ? msg_type(msg) : TIPC_DIRECT_MSG;
switch (dest_type) { switch (dest_type) {
case TIPC_NAMED_MSG: case TIPC_NAMED_MSG:
has_name = 1;
anc_data[0] = msg_nametype(msg); anc_data[0] = msg_nametype(msg);
anc_data[1] = msg_namelower(msg); anc_data[1] = msg_namelower(msg);
anc_data[2] = msg_namelower(msg); anc_data[2] = msg_namelower(msg);
break; break;
case TIPC_MCAST_MSG: case TIPC_MCAST_MSG:
has_name = 1;
anc_data[0] = msg_nametype(msg); anc_data[0] = msg_nametype(msg);
anc_data[1] = msg_namelower(msg); anc_data[1] = msg_namelower(msg);
anc_data[2] = msg_nameupper(msg); anc_data[2] = msg_nameupper(msg);
break; break;
case TIPC_CONN_MSG: case TIPC_CONN_MSG:
has_name = (tport->conn_type != 0);
anc_data[0] = tport->conn_type; anc_data[0] = tport->conn_type;
anc_data[1] = tport->conn_instance; anc_data[1] = tport->conn_instance;
anc_data[2] = tport->conn_instance; anc_data[2] = tport->conn_instance;
break; break;
default: default:
anc_data[0] = 0; has_name = 0;
} }
if (anc_data[0] && if (has_name &&
(res = put_cmsg(m, SOL_SOCKET, TIPC_DESTNAME, 12, anc_data))) (res = put_cmsg(m, SOL_SOCKET, TIPC_DESTNAME, 12, anc_data)))
return res; return res;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment