RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-27 08:01:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: proxy_protocol: Use size_t when parsing TLVs

Browse Source 
Change `int` to `size_t` for consistency.
This commit is contained in:
Tim Duesterhus 2020-03-05 23:11:02 +01:00 committed by Willy Tarreau
parent 488ee7fb6e
commit ba837ec367
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/connection.c
View File

@ -457,7 +457,7 @@ int conn_sock_drain(struct connection *conn)
/* /*
* Get data length from tlv * Get data length from tlv
*/ */
static int get_tlv_length(const struct tlv *src) static inline size_t get_tlv_length(const struct tlv *src)
{ {
return (src->length_hi << 8) | src->length_lo; return (src->length_hi << 8) | src->length_lo;
} }
@ -491,7 +491,7 @@ int conn_recv_proxy(struct connection *conn, int flag)
struct proxy_hdr_v2 *hdr_v2; struct proxy_hdr_v2 *hdr_v2;
const char v2sig[] = PP2_SIGNATURE; const char v2sig[] = PP2_SIGNATURE;
size_t total_v2_len; size_t total_v2_len;
int tlv_offset = 0; size_t tlv_offset = 0;
int ret; int ret;
if (!conn_ctrl_ready(conn)) if (!conn_ctrl_ready(conn))
@ -706,7 +706,7 @@ int conn_recv_proxy(struct connection *conn, int flag)
/* TLV parsing */ /* TLV parsing */
while (tlv_offset < total_v2_len) { while (tlv_offset < total_v2_len) {
struct tlv *tlv_packet; struct tlv *tlv_packet;
int tlv_len; size_t tlv_len;
/* Verify that we have at least TLV_HEADER_SIZE bytes left */ /* Verify that we have at least TLV_HEADER_SIZE bytes left */
if (tlv_offset + TLV_HEADER_SIZE > total_v2_len) if (tlv_offset + TLV_HEADER_SIZE > total_v2_len)