diff options
| author | Jon Paul Maloy <jon.maloy@ericsson.com> | 2014-06-26 03:41:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-27 21:50:56 +0200 |
| commit | ac0074ee70ddb32f62d918b31cb20e3c947c75a1 (patch) | |
| tree | 27c0e82b319ecbcbd23c1c3039b4b0e0d5a9ec1c /net/tipc/socket.h | |
| parent | tipc: same receive code path for connection protocol and data messages (diff) | |
| download | linux-ac0074ee70ddb32f62d918b31cb20e3c947c75a1.tar.xz linux-ac0074ee70ddb32f62d918b31cb20e3c947c75a1.zip | |
tipc: clean up connection protocol reception function
We simplify the code for receiving connection probes, leveraging the
recently introduced tipc_msg_reverse() function. We also stick to
the principle of sending a possible response message directly from
the calling (tipc_sk_rcv or backlog_rcv) functions, hence making
the call chain shallower and easier to follow.
We make one small protocol change here, allowed according to
the spec. If a protocol message arrives from a remote socket that
is not the one we are connected to, we are currently generating a
connection abort message and send it to the source. This behavior
is unnecessary, and might even be a security risk, so instead we
now choose to only ignore the message. The consequnce for the sender
is that he will need longer time to discover his mistake (until the
next timeout), but this is an extreme corner case, and may happen
anyway under other circumstances, so we deem this change acceptable.
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/socket.h')
| -rw-r--r-- | net/tipc/socket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/tipc/socket.h b/net/tipc/socket.h index 3afcd2a70b31..69fd06bce68a 100644 --- a/net/tipc/socket.h +++ b/net/tipc/socket.h @@ -38,6 +38,9 @@ #include "port.h" #include <net/sock.h> +#define TIPC_CONN_OK 0 +#define TIPC_CONN_PROBING 1 + /** * struct tipc_sock - TIPC socket structure * @sk: socket - interacts with 'port' and with user via the socket API |