RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-23 06:06:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: peers: Replace hard-coded values by macros.

Browse Source 
All the peer stick-table messages are made of a 2-byte header (PEER_MSG_HEADER_LEN)
followed by the encoded length of the remaining data wich is harcoded as 5 (in bytes)
for the maximum (PEER_MSG_ENCODED_LENGTH_MAXLEN). With such a length we can encode
a maximum length which equals to (1 << 32) - 1, which is from far enough.

This patches replaces both these values by macros where applicable.
This commit is contained in:
Frdric Lcaille 2019-05-24 14:32:27 +02:00 committed by Willy Tarreau
parent 1673bbdf98
commit 39143340ec
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/peers.c
View File

@ -167,6 +167,11 @@ struct peer_prep_params {
#define PEER_MSG_STKT_UPDATE_TIMED 0x85
#define PEER_MSG_STKT_INCUPDATE_TIMED 0x86
/* The maximum length of an encoded data length. */
#define PEER_MSG_ENC_LENGTH_MAXLEN 5
#define PEER_MSG_HEADER_LEN 2
/**********************************/
/* Peer Session IO handler states */
/**********************************/
@ -516,7 +521,7 @@ static int peer_prepare_switchmsg(char *msg, size_t size, struct peer_prep_param
struct shared_table *st;
st = params->swtch.shared_table;
cursor = datamsg = msg + 2 + 5;
cursor = datamsg = msg + PEER_MSG_HEADER_LEN + PEER_MSG_ENC_LENGTH_MAXLEN;
/* Encode data */
@ -596,7 +601,7 @@ static int peer_prepare_ackmsg(char *msg, size_t size, struct peer_prep_params *
uint32_t netinteger;
struct shared_table *st;
cursor = datamsg = msg + 2 + 5;
cursor = datamsg = msg + PEER_MSG_HEADER_LEN + PEER_MSG_ENC_LENGTH_MAXLEN;
st = p->ack.shared_table;
intencode(st->remote_id, &cursor);