File 0387-erl_interface-Fix-simultaneous-connection-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0387-erl_interface-Fix-simultaneous-connection-setup.patch of Package erlang (Revision ac78bcc5a6f7a4d1efd770008567e9f7)

Currently displaying revision ac78bcc5a6f7a4d1efd770008567e9f7 , Show latest

From 60bef434c1e0776443887e06df44b59008a76df8 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 19 Jun 2018 15:48:09 +0200
Subject: [PATCH] erl_interface: Fix simultaneous connection setup

by also accepting status "ok_simultaneous".
---
 lib/erl_interface/src/connect/ei_connect.c | 9 ++++++---
 1 file 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 5c01223e3d..be228ab853 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:
-- 
2.16.4

Places

File 0387-erl_interface-Fix-simultaneous-connection-setup.patch of Package erlang (Revision ac78bcc5a6f7a4d1efd770008567e9f7)

Places