Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce865a61 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[DCCP]: Add support for abortive release 



This continues from the previous patch and adds support for actively aborting
a DCCP connection, using a Reset Code 2, "Aborted" to inform the peer of an
abortive release.

I have tried this in various client/server settings and it works as expected.

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d83bd95b

net/dccp/proto.c

+13 −2
Original line number Diff line number Diff line
@@ -276,6 +276,12 @@ static inline int dccp_listen_start(struct sock *sk, int backlog) 
	return inet_csk_listen_start(sk, backlog);

}



static inline int dccp_need_reset(int state)

{

	return state != DCCP_CLOSED && state != DCCP_LISTEN &&

	       state != DCCP_REQUESTING;

}



int dccp_disconnect(struct sock *sk, int flags)

{

	struct inet_connection_sock *icsk = inet_csk(sk);
@@ -286,10 +292,15 @@ int dccp_disconnect(struct sock *sk, int flags) 
	if (old_state != DCCP_CLOSED)

		dccp_set_state(sk, DCCP_CLOSED);



	/* ABORT function of RFC793 */

	/*

	 * This corresponds to the ABORT function of RFC793, sec. 3.8

	 * TCP uses a RST segment, DCCP a Reset packet with Code 2, "Aborted".

	 */

	if (old_state == DCCP_LISTEN) {

		inet_csk_listen_stop(sk);

	/* FIXME: do the active reset thing */

	} else if (dccp_need_reset(old_state)) {

		dccp_send_reset(sk, DCCP_RESET_CODE_ABORTED);

		sk->sk_err = ECONNRESET;

	} else if (old_state == DCCP_REQUESTING)

		sk->sk_err = ECONNRESET;