diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-10-26 09:12:35 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-10-26 09:12:35 +0100 |
| commit | abb62a6d1918bc46ada942ae4f4c79caf2690d86 (patch) | |
| tree | 902cf0d0840c896e8dc7df7ab26bf2e284fc39cc /erts/emulator/beam/packet_parser.c | |
| parent | a76cc1d337c0bf44ecefebeccac2d08e496ba7e8 (diff) | |
| parent | 235bf943d762bfdb5638d23b3270f92c50050b0a (diff) | |
| download | otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.tar.gz otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.tar.bz2 otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.zip | |
Merge branch 'ia/pr/758/OTP-12837' into maint
* ia/pr/758/OTP-12837:
erts: Include test in group so that it is run
erts: Clarify documentation
erts: Add {line_delimiter, byte()} option to inet:setopts/2
Diffstat (limited to 'erts/emulator/beam/packet_parser.c')
| -rw-r--r-- | erts/emulator/beam/packet_parser.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/packet_parser.c b/erts/emulator/beam/packet_parser.c index 2dd421a9e9..a737a86f14 100644 --- a/erts/emulator/beam/packet_parser.c +++ b/erts/emulator/beam/packet_parser.c @@ -256,6 +256,7 @@ int packet_get_length(enum PacketParseType htype, const char* ptr, unsigned n, /* Bytes read so far */ unsigned max_plen, /* Max packet length, 0=no limit */ unsigned trunc_len, /* Truncate (lines) if longer, 0=no limit */ + char delimiter, /* Line delimiting character */ int* statep) /* Protocol specific state */ { unsigned hlen, plen; @@ -299,9 +300,9 @@ int packet_get_length(enum PacketParseType htype, goto remain; case TCP_PB_LINE_LF: { - /* TCP_PB_LINE_LF: [Data ... \n] */ + /* TCP_PB_LINE_LF: [Data ... Delimiter] */ const char* ptr2; - if ((ptr2 = memchr(ptr, '\n', n)) == NULL) { + if ((ptr2 = memchr(ptr, delimiter, n)) == NULL) { if (n > max_plen && max_plen != 0) { /* packet full */ DEBUGF((" => packet full (no NL)=%d\r\n", n)); goto error; |