aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/packet_parser.c
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-10-26 10:33:14 +0100
committerIngela Anderton Andin <[email protected]>2015-10-26 10:33:14 +0100
commit030447db58eba15398a357a81f20efa409113bc9 (patch)
tree160eceb4aace2bd51a49ff66dcbb197cd0ce931c /erts/emulator/beam/packet_parser.c
parentd9f88cbd3c096d09cac05450e6b075b1109da1a0 (diff)
parentabb62a6d1918bc46ada942ae4f4c79caf2690d86 (diff)
downloadotp-030447db58eba15398a357a81f20efa409113bc9.tar.gz
otp-030447db58eba15398a357a81f20efa409113bc9.tar.bz2
otp-030447db58eba15398a357a81f20efa409113bc9.zip
Update primary bootstrap
Diffstat (limited to 'erts/emulator/beam/packet_parser.c')
-rw-r--r--erts/emulator/beam/packet_parser.c5
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;