RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-19 18:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: connection: use read_u32() instead of a cast in the netscaler parser

Browse Source 
The netscaler protocol parser used to involve a few casts from char to
(uint32_t*), let's properly use u32 for this instead.
This commit is contained in:
Willy Tarreau 2020-02-25 10:06:49 +01:00
parent 26474c486d
commit 1ac83af560
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

@ -837,17 +837,17 @@ int conn_recv_netscaler_cip(struct connection *conn, int flag)
/* Decode a possible NetScaler Client IP request, fail early if /* Decode a possible NetScaler Client IP request, fail early if
* it does not match */ * it does not match */
if (ntohl(*(uint32_t *)line) != __objt_listener(conn->target)->bind_conf->ns_cip_magic) if (ntohl(read_u32(line)) != __objt_listener(conn->target)->bind_conf->ns_cip_magic)
goto bad_magic; goto bad_magic;
/* Legacy CIP protocol */ /* Legacy CIP protocol */
if ((trash.area[8] & 0xD0) == 0x40) { if ((trash.area[8] & 0xD0) == 0x40) {
hdr_len = ntohl(*(uint32_t *)(line+4)); hdr_len = ntohl(read_u32((line+4)));
line += 8; line += 8;
} }
/* Standard CIP protocol */ /* Standard CIP protocol */
else if (trash.area[8] == 0x00) { else if (trash.area[8] == 0x00) {
hdr_len = ntohs(*(uint32_t *)(line+10)); hdr_len = ntohs(read_u32((line+10)));
line += 12; line += 12;
} }
/* Unknown CIP protocol */ /* Unknown CIP protocol */