RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-11 16:29:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

DOC: proxy protocol example parser was still wrong

Browse Source 
Now that version and cmd are in the same byte, it is not possible
anymore to compare the version as a 13th byte.
This commit is contained in:
Willy Tarreau 2014-06-14 08:36:29 +02:00
parent 4c20d29c29
commit 01320c9a34
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/proxy-protocol.txt
View File

@ -751,7 +751,7 @@ side is even simpler and can easily be deduced from this sample code.
struct sockaddr_storage from; /* already filled by accept() */
struct sockaddr_storage to; /* already filled by getsockname() */
const char v2sig[13] = "\x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x02";
const char v2sig[12] = "\x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A";
/* returns 0 if needs to poll, <0 upon error or >0 if it did the job */
int read_evt(int fd)
@ -795,7 +795,8 @@ side is even simpler and can easily be deduced from this sample code.
if (ret == -1)
return (errno == EAGAIN) ? 0 : -1;
if (ret >= 16 && memcmp(&hdr.v2, v2sig, 13) == 0) {
if (ret >= 16 && memcmp(&hdr.v2, v2sig, 12) == 0 &&
(hdr.v2.ver_cmd & 0xF0) == 0x20) {
size = 16 + hdr.v2.len;
if (ret < size)
return -1; /* truncated or too large header */