Skip to content

Avoid -Warray-bounds on PROXY Protocol Builder #7488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masaori335 merged 1 commit into from
Feb 8, 2021
Merged

Avoid -Warray-bounds on PROXY Protocol Builder #7488

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions iocore/net/ProxyProtocol.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ constexpr uint16_t PPv2_ADDR_LEN_INET = 4 + 4 + 2 + 2;
constexpr uint16_t PPv2_ADDR_LEN_INET6 = 16 + 16 + 2 + 2;
constexpr uint16_t PPv2_ADDR_LEN_UNIX = 108 + 108;

const ts::BWFSpec ADDR_ONLY_FMT{"::a"};
Copy link
Contributor Author

@masaori335 masaori335 Feb 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd be great if we can make this constexpr, but it's another story.


struct PPv2Hdr {
uint8_t sig[12]; ///< preface
uint8_t ver_cmd; ///< protocol version and command
Expand Down Expand Up @@ -334,19 +336,11 @@ proxy_protocol_v1_build(uint8_t *buf, size_t max_buf_len, const ProxyProtocol &p
bw.write(PPv1_DELIMITER);

// the layer 3 source address
char src_ip_buf[INET6_ADDRSTRLEN];
ats_ip_ntop(pp_info.src_addr, src_ip_buf, sizeof(src_ip_buf));
size_t src_ip_len = strnlen(src_ip_buf, sizeof(src_ip_buf));

bw.write(src_ip_buf, src_ip_len);
bwformat(bw, ADDR_ONLY_FMT, pp_info.src_addr);
bw.write(PPv1_DELIMITER);

// the layer 3 destination address
char dst_ip_buf[INET6_ADDRSTRLEN];
ats_ip_ntop(pp_info.dst_addr, dst_ip_buf, sizeof(dst_ip_buf));
size_t dst_ip_len = strnlen(dst_ip_buf, sizeof(dst_ip_buf));

bw.write(dst_ip_buf, dst_ip_len);
bwformat(bw, ADDR_ONLY_FMT, pp_info.dst_addr);
bw.write(PPv1_DELIMITER);

// TCP source port
Expand Down