2 files changed, 58 insertions, 29 deletions

diff --git a/lib/erl_interface/test/ei_accept_SUITE.erl b/lib/erl_interface/test/ei_accept_SUITE.erl
index e06ee762d7..16eb0901ef 100644
--- a/lib/erl_interface/test/ei_accept_SUITE.erl
+++ b/lib/erl_interface/test/ei_accept_SUITE.erl
@@ -44,33 +44,31 @@ ei_accept(Config) when is_list(Config) ->
     io:format("Myname ~p ~n",  [Myname]),
     EINode = list_to_atom("c42@"++Myname),
     io:format("EINode ~p ~n",  [EINode]),
+
+    %% We take this opportunity to also test export-funs and bit-strings
+    %% with (ugly) tuple fallbacks.
+    %% Test both toward pending connection and established connection.
+    RealTerms = [<<1:1>>,     fun lists:map/2],
+    Fallbacks = [{<<128>>,1}, {lists,map}],
+
     Self = self(),
-    TermToSend= {call, Self, "Test"},
-    F= fun() ->
-               case waitfornode("c42",20) of
-                   true ->
-                       {any, EINode} ! TermToSend,
-                       Self ! sent_ok;
-                   false ->
-                       Self ! never_published
-               end,
-               ok
-       end,
-
-    spawn(F),
+    Funny = fun() -> hello end,
+    TermToSend = {call, Self, "Test", Funny, RealTerms},
+    TermToGet  = {call, Self, "Test", Funny, Fallbacks},
     Port = 6543,
-    {ok, Fd, _Node} = ei_accept(P, Port),
-    TermReceived= ei_receive(P, Fd),
-    io:format("Sent ~p received ~p ~n", [TermToSend, TermReceived]),
-    TermToSend= TermReceived,
-    receive
-        sent_ok ->
-            ok;
-        Unknown ->
-            io:format("~p ~n", [Unknown])
-    after 1000 ->
-              io:format("timeout ~n")
-    end,
+    {ok, ListenFd} = ei_publish(P, Port),
+    {any, EINode} ! TermToSend,
+    {ok, Fd, _Node} = ei_accept(P, ListenFd),
+    Got1 = ei_receive(P, Fd),
+
+    %% Send again, now without auto-connect
+    {any, EINode} ! TermToSend,
+    Got2 = ei_receive(P, Fd),
+
+    io:format("Sent ~p~nExp. ~p~nGot1 ~p~nGot2 ~p~n", [TermToSend, TermToGet, Got1, Got2]),
+    TermToGet = Got1,
+    TermToGet = Got2,
+
     runner:finish(P),
     ok.
 
@@ -137,8 +135,15 @@ ei_connect_init(P, Num, Cookie, Creation) ->
         {term,Int} when is_integer(Int) -> Int
     end.
 
-ei_accept(P, PortNo) ->
-    send_command(P, ei_accept, [PortNo]),
+ei_publish(P, PortNo) ->
+    send_command(P, ei_publish, [PortNo]),
+    case get_term(P) of
+        {term,{ListenFd, EpmdFd, _}} when ListenFd >= 0, EpmdFd >= 0 -> {ok, ListenFd};
+        {term,{_, _, Errno}} -> {error,Errno}
+    end.
+
+ei_accept(P, ListenFd) ->
+    send_command(P, ei_accept, [ListenFd]),
     case get_term(P) of
         {term,{Fd, _, Node}} when Fd >= 0 -> {ok, Fd, Node};
         {term,{_Fd, Errno, _Node}} -> {error,Errno}
diff --git a/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c b/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
index 7b81ee5491..2355192cc2 100644
--- a/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
+++ b/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
@@ -43,6 +43,7 @@
 #include "ei_runner.h"
 
 static void cmd_ei_connect_init(char* buf, int len);
+static void cmd_ei_publish(char* buf, int len);
 static void cmd_ei_accept(char* buf, int len);
 static void cmd_ei_receive(char* buf, int len);
 static void cmd_ei_unpublish(char* buf, int len);
@@ -58,6 +59,7 @@ static struct {
     void (*func)(char* buf, int len);
 } commands[] = {
     "ei_connect_init",  3, cmd_ei_connect_init,
+    "ei_publish", 	1, cmd_ei_publish,
     "ei_accept", 	1, cmd_ei_accept,
     "ei_receive",  	1, cmd_ei_receive,
     "ei_unpublish",     0, cmd_ei_unpublish
@@ -149,11 +151,10 @@ static int my_listen(int port)
     return listen_fd;
 }
 
-static void cmd_ei_accept(char* buf, int len)
+static void cmd_ei_publish(char* buf, int len)
 {
     int index = 0;
     int listen, r;
-    ErlConnect conn;
     long port;
     ei_x_buff x;
     int i;
@@ -170,6 +171,29 @@ static void cmd_ei_accept(char* buf, int len)
 #ifdef VXWORKS
     save_fd(i);
 #endif
+    /* send listen-fd, result and errno */
+    ei_x_new_with_version(&x);
+    ei_x_encode_tuple_header(&x, 3);
+    ei_x_encode_long(&x, listen);
+    ei_x_encode_long(&x, i);
+    ei_x_encode_long(&x, erl_errno);
+    send_bin_term(&x);
+    ei_x_free(&x);
+}
+
+static void cmd_ei_accept(char* buf, int len)
+{
+    int index = 0;
+    int r;
+    ErlConnect conn;
+    long listen;
+    ei_x_buff x;
+    int i;
+
+    /* get port */
+    if (ei_decode_long(buf, &index, &listen) < 0)
+	fail("expected int (listen fd)");
+
     r = ei_accept(&ec, listen, &conn);
 #ifdef VXWORKS
     save_fd(r);