mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: connection: Add blank line after declarations in PP handling

Browse Source 
This adds the missing blank lines in `make_proxy_line_v2` and
`conn_recv_proxy`. It also adjusts the type of the temporary variable
used for the return value of `recv` to be `ssize_t` instead of `int`.
This commit is contained in:
Tim Duesterhus 2020-03-13 12:34:25 +01:00 committed by Willy Tarreau
parent cf6e0c8a83
commit a8692f3fe0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/connection.c
View File

@ -802,7 +802,8 @@ int conn_recv_proxy(struct connection *conn, int flag)
* fail. * fail.
*/ */
while (1) { while (1) {
int len2 = recv(conn->handle.fd, trash.area, trash.data, 0); ssize_t len2 = recv(conn->handle.fd, trash.area, trash.data, 0);
if (len2 < 0 && errno == EINTR) if (len2 < 0 && errno == EINTR)
continue; continue;
if (len2 != trash.data) if (len2 != trash.data)
@ -1437,6 +1438,7 @@ int make_proxy_line_v2(char *buf, int buf_len, struct server *srv, struct connec
if (srv->pp_opts & SRV_PP_V2_CRC32C) { if (srv->pp_opts & SRV_PP_V2_CRC32C) {
uint32_t zero_crc32c = 0; uint32_t zero_crc32c = 0;
if ((buf_len - ret) < sizeof(struct tlv)) if ((buf_len - ret) < sizeof(struct tlv))
return 0; return 0;
tlv_crc32c_p = (void *)((struct tlv *)&buf[ret])->value; tlv_crc32c_p = (void *)((struct tlv *)&buf[ret])->value;
@ -1486,6 +1488,7 @@ int make_proxy_line_v2(char *buf, int buf_len, struct server *srv, struct connec
if (srv->pp_opts & SRV_PP_V2_SSL) { if (srv->pp_opts & SRV_PP_V2_SSL) {
struct tlv_ssl *tlv; struct tlv_ssl *tlv;
int ssl_tlv_len = 0; int ssl_tlv_len = 0;
if ((buf_len - ret) < sizeof(struct tlv_ssl)) if ((buf_len - ret) < sizeof(struct tlv_ssl))
return 0; return 0;
tlv = (struct tlv_ssl *)&buf[ret]; tlv = (struct tlv_ssl *)&buf[ret];