diff options
| author | Sverker Eriksson <[email protected]> | 2018-06-29 15:54:23 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-06-29 15:54:23 +0200 |
| commit | 4f3f60ce556593da6aa42467efbc67e3e4941b80 (patch) | |
| tree | 05717e99179459c41fadd0ea0e6b2eac798bddb1 /lib/erl_interface/src | |
| parent | 4ade8ccfa3c4658436bb4b764298f013e526edc1 (diff) | |
| parent | d8f9138ce941fbce571a05afaf2453765aa25899 (diff) | |
| download | otp-4f3f60ce556593da6aa42467efbc67e3e4941b80.tar.gz otp-4f3f60ce556593da6aa42467efbc67e3e4941b80.tar.bz2 otp-4f3f60ce556593da6aa42467efbc67e3e4941b80.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
kernel: Fix tick count bug when pending writes
kernel: Send tick to hidden node even if pending writes
ic: Fix buffer overrun bug in oe_ei_encode_atom
erl_interface: Fix simultaneous connection setup
Diffstat (limited to 'lib/erl_interface/src')
| -rw-r--r-- | lib/erl_interface/src/connect/ei_connect.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c index f5034ca3e8..34f4620866 100644 --- a/lib/erl_interface/src/connect/ei_connect.c +++ b/lib/erl_interface/src/connect/ei_connect.c @@ -1357,11 +1357,14 @@ static int recv_status(int fd, unsigned ms) "<- RECV_STATUS socket read failed (%d)", rlen); goto error; } - if (rlen == 3 && buf[0] == 's' && buf[1] == 'o' && - buf[2] == 'k') { + + EI_TRACE_CONN2("recv_status", + "<- RECV_STATUS (%.*s)", (rlen>20 ? 20 : rlen), buf); + + if (rlen >= 3 && buf[0] == 's' && buf[1] == 'o' && buf[2] == 'k') { + /* Expecting "sok" or "sok_simultaneous" */ if (!is_static) free(buf); - EI_TRACE_CONN0("recv_status","<- RECV_STATUS (ok)"); return 0; } error: |