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

Commit bba304db authored by David Howells's avatar David Howells
Browse files

rxrpc: Turn connection #defines into enums and put outside struct def 



Turn the connection event and state #define lists into enums and move
outside of the struct definition.

Whilst we're at it, change _SERVER to _SERVICE in those identifiers and add
EV_ into the event name to distinguish them from flags and states.

Also add a symbol indicating the number of states and use that in the state
text array.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 5acbee46

net/rxrpc/ar-internal.h

+30 −12
Original line number Diff line number Diff line
@@ -253,6 +253,35 @@ struct rxrpc_conn_parameters { 
	u32			security_level;	/* Security level selected */

};



/*

 * Bits in the connection flags.

 */

enum rxrpc_conn_flag {

	RXRPC_CONN_HAS_IDR,		/* Has a client conn ID assigned */

};



/*

 * Events that can be raised upon a connection.

 */

enum rxrpc_conn_event {

	RXRPC_CONN_EV_CHALLENGE,	/* Send challenge packet */

};



/*

 * The connection protocol state.

 */

enum rxrpc_conn_proto_state {

	RXRPC_CONN_UNUSED,		/* Connection not yet attempted */

	RXRPC_CONN_CLIENT,		/* Client connection */

	RXRPC_CONN_SERVICE_UNSECURED,	/* Service unsecured connection */

	RXRPC_CONN_SERVICE_CHALLENGING,	/* Service challenging for security */

	RXRPC_CONN_SERVICE,		/* Service secured connection */

	RXRPC_CONN_REMOTELY_ABORTED,	/* Conn aborted by peer */

	RXRPC_CONN_LOCALLY_ABORTED,	/* Conn aborted locally */

	RXRPC_CONN_NETWORK_ERROR,	/* Conn terminated by network error */

	RXRPC_CONN__NR_STATES

};



/*

 * RxRPC connection definition

 * - matched by { local, peer, epoch, conn_id, direction }
@@ -279,23 +308,12 @@ struct rxrpc_connection { 
	struct crypto_skcipher	*cipher;	/* encryption handle */

	struct rxrpc_crypt	csum_iv;	/* packet checksum base */

	unsigned long		flags;

#define RXRPC_CONN_HAS_IDR	0		/* - Has a client conn ID assigned */

	unsigned long		events;

#define RXRPC_CONN_CHALLENGE	0		/* send challenge packet */

	unsigned long		put_time;	/* Time at which last put */

	rwlock_t		lock;		/* access lock */

	spinlock_t		state_lock;	/* state-change lock */

	atomic_t		usage;

	enum {					/* current state of connection */

		RXRPC_CONN_UNUSED,		/* - connection not yet attempted */

		RXRPC_CONN_CLIENT,		/* - client connection */

		RXRPC_CONN_SERVER_UNSECURED,	/* - server unsecured connection */

		RXRPC_CONN_SERVER_CHALLENGING,	/* - server challenging for security */

		RXRPC_CONN_SERVER,		/* - server secured connection */

		RXRPC_CONN_REMOTELY_ABORTED,	/* - conn aborted by peer */

		RXRPC_CONN_LOCALLY_ABORTED,	/* - conn aborted locally */

		RXRPC_CONN_NETWORK_ERROR,	/* - conn terminated by network error */

	} state;

	enum rxrpc_conn_proto_state state : 8;	/* current state of connection */

	u32			local_abort;	/* local abort code */

	u32			remote_abort;	/* remote abort code */

	int			error;		/* local error incurred */

net/rxrpc/call_accept.c

+3 −3
Original line number Diff line number Diff line
@@ -128,12 +128,12 @@ static int rxrpc_accept_incoming_call(struct rxrpc_local *local, 


		spin_lock(&call->conn->state_lock);

		if (sp->hdr.securityIndex > 0 &&

		    call->conn->state == RXRPC_CONN_SERVER_UNSECURED) {

		    call->conn->state == RXRPC_CONN_SERVICE_UNSECURED) {

			_debug("await conn sec");

			list_add_tail(&call->accept_link, &rx->secureq);

			call->conn->state = RXRPC_CONN_SERVER_CHALLENGING;

			call->conn->state = RXRPC_CONN_SERVICE_CHALLENGING;

			rxrpc_get_connection(call->conn);

			set_bit(RXRPC_CONN_CHALLENGE, &call->conn->events);

			set_bit(RXRPC_CONN_EV_CHALLENGE, &call->conn->events);

			rxrpc_queue_conn(call->conn);

		} else {

			_debug("conn ready");

net/rxrpc/conn_event.c

+3 −3
Original line number Diff line number Diff line
@@ -195,8 +195,8 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, 
		read_lock_bh(&conn->lock);

		spin_lock(&conn->state_lock);



		if (conn->state == RXRPC_CONN_SERVER_CHALLENGING) {

			conn->state = RXRPC_CONN_SERVER;

		if (conn->state == RXRPC_CONN_SERVICE_CHALLENGING) {

			conn->state = RXRPC_CONN_SERVICE;

			for (loop = 0; loop < RXRPC_MAXCALLS; loop++)

				rxrpc_call_is_secure(conn->channels[loop]);

		}
@@ -268,7 +268,7 @@ void rxrpc_process_connection(struct work_struct *work) 


	rxrpc_get_connection(conn);



	if (test_and_clear_bit(RXRPC_CONN_CHALLENGE, &conn->events)) {

	if (test_and_clear_bit(RXRPC_CONN_EV_CHALLENGE, &conn->events)) {

		rxrpc_secure_connection(conn);

		rxrpc_put_connection(conn);

	}

net/rxrpc/conn_object.c

+2 −2
Original line number Diff line number Diff line
@@ -399,9 +399,9 @@ struct rxrpc_connection *rxrpc_incoming_connection(struct rxrpc_local *local, 
	candidate->params.service_id	= sp->hdr.serviceId;

	candidate->security_ix		= sp->hdr.securityIndex;

	candidate->out_clientflag	= 0;

	candidate->state		= RXRPC_CONN_SERVER;

	candidate->state		= RXRPC_CONN_SERVICE;

	if (candidate->params.service_id)

		candidate->state	= RXRPC_CONN_SERVER_UNSECURED;

		candidate->state	= RXRPC_CONN_SERVICE_UNSECURED;



	write_lock_bh(&peer->conn_lock);

net/rxrpc/proc.c

+9 −9
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
#include <net/af_rxrpc.h>

#include "ar-internal.h"



static const char *const rxrpc_conn_states[] = {

static const char *const rxrpc_conn_states[RXRPC_CONN__NR_STATES] = {

	[RXRPC_CONN_UNUSED]			= "Unused  ",

	[RXRPC_CONN_CLIENT]			= "Client  ",

	[RXRPC_CONN_SERVER_UNSECURED]	= "SvUnsec ",

	[RXRPC_CONN_SERVER_CHALLENGING]	= "SvChall ",

	[RXRPC_CONN_SERVER]		= "SvSecure",

	[RXRPC_CONN_SERVICE_UNSECURED]		= "SvUnsec ",

	[RXRPC_CONN_SERVICE_CHALLENGING]	= "SvChall ",

	[RXRPC_CONN_SERVICE]			= "SvSecure",

	[RXRPC_CONN_REMOTELY_ABORTED]		= "RmtAbort",

	[RXRPC_CONN_LOCALLY_ABORTED]		= "LocAbort",

	[RXRPC_CONN_NETWORK_ERROR]		= "NetError",