Commit 18f1387c authored by David Howells's avatar David Howells

rxrpc: Update protocol definitions slightly

Update the protocol definitions in include/rxrpc/packet.h slightly:

 (1) Get rid of RXRPC_PROCESS_MAXCALLS as it's redundant (same as
     RXRPC_MAXCALLS).

 (2) In struct rxrpc_jumbo_header, put _rsvd in a union with a field called
     cksum to match struct rxrpc_wire_header.

 (3) Provide RXRPC_JUMBO_SUBPKTLEN which is the total of the amount of data
     in a non-terminal subpacket plus the following secondary header for
     the next packet included in the jumbo packet.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent cf13258f
...@@ -34,8 +34,6 @@ struct rxrpc_wire_header { ...@@ -34,8 +34,6 @@ struct rxrpc_wire_header {
#define RXRPC_CID_INC (1 << RXRPC_CIDSHIFT) /* connection ID increment */ #define RXRPC_CID_INC (1 << RXRPC_CIDSHIFT) /* connection ID increment */
__be32 callNumber; /* call ID (0 for connection-level packets) */ __be32 callNumber; /* call ID (0 for connection-level packets) */
#define RXRPC_PROCESS_MAXCALLS (1<<2) /* maximum number of active calls per conn (power of 2) */
__be32 seq; /* sequence number of pkt in call stream */ __be32 seq; /* sequence number of pkt in call stream */
__be32 serial; /* serial number of pkt sent to network */ __be32 serial; /* serial number of pkt sent to network */
...@@ -93,10 +91,14 @@ struct rxrpc_wire_header { ...@@ -93,10 +91,14 @@ struct rxrpc_wire_header {
struct rxrpc_jumbo_header { struct rxrpc_jumbo_header {
uint8_t flags; /* packet flags (as per rxrpc_header) */ uint8_t flags; /* packet flags (as per rxrpc_header) */
uint8_t pad; uint8_t pad;
__be16 _rsvd; /* reserved (used by kerberos security as cksum) */ union {
__be16 _rsvd; /* reserved */
__be16 cksum; /* kerberos security checksum */
};
}; };
#define RXRPC_JUMBO_DATALEN 1412 /* non-terminal jumbo packet data length */ #define RXRPC_JUMBO_DATALEN 1412 /* non-terminal jumbo packet data length */
#define RXRPC_JUMBO_SUBPKTLEN (RXRPC_JUMBO_DATALEN + sizeof(struct rxrpc_jumbo_header))
/*****************************************************************************/ /*****************************************************************************/
/* /*
......
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