Merge branch 'pan/active_once/OTP-10055' into maint

* pan/active_once/OTP-10055:
  Remove race in gen_tcp_misc_SUITE:otp_9389
  gen_tcp: Make setopts(S,[{active,once}]) try a read

2 files changed, 23 insertions, 4 deletions

diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index bf376f0494..76a9b55179 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -3124,6 +3124,7 @@ static int tcp_message(inet_descriptor* desc, const char* buf, int len)
     int i = 0;
 
     DEBUGF(("tcp_message(%ld): len = %d\r\n", (long)desc->port, len));    
+    /* XXX fprintf(stderr,"tcp_message send.\r\n"); */
 
     i = LOAD_ATOM(spec, i, am_tcp);
     i = LOAD_PORT(spec, i, desc->dport);
@@ -5426,6 +5427,7 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
     if (IS_SCTP(desc))
 	return sctp_set_opts(desc, ptr, len);
 #endif
+    /* XXX { int i; for(i=0;i<len;++i) fprintf(stderr,"0x%02X, ", (unsigned) ptr[i]); fprintf(stderr,"\r\n");} */
 
     while(len >= 5) {
 	opt = *ptr++;
@@ -5755,10 +5757,16 @@ skip_os_setopt:
 	if (desc->active != old_active)
 	    sock_select(desc, (FD_READ|FD_CLOSE), (desc->active>0));
 
+	/* XXX: UDP sockets could also trigger immediate read here NIY */
 	if ((desc->stype==SOCK_STREAM) && desc->active) {
 	    if (!old_active || (desc->htype != old_htype)) {
 		/* passive => active change OR header type change in active mode */
-		return 1;
+		/* Return > 1 if only active changed to INET_ONCE -> direct read if
+		   header type is unchanged. */
+		/* XXX fprintf(stderr,"desc->htype == %d, old_htype == %d, 
+		   desc->active == %d, old_active == %d\r\n",(int)desc->htype, 
+		   (int) old_htype, (int) desc->active, (int) old_active );*/
+		return 1+(desc->htype == old_htype && desc->active == INET_ONCE);
 	    }
 	    return 0;
 	}
@@ -7592,17 +7600,27 @@ static ErlDrvSSizeT inet_ctl(inet_descriptor* desc, int cmd, char* buf,
 
     case INET_REQ_SETOPTS:  {   /* set options */
 	DEBUGF(("inet_ctl(%ld): SETOPTS\r\n", (long)desc->port)); 
+	/* XXX fprintf(stderr,"inet_ctl(%ld): SETOPTS (len = %d)\r\n", (long)desc->port,(int) len); */
 	switch(inet_set_opts(desc, buf, len)) {
 	case -1: 
 	    return ctl_error(EINVAL, rbuf, rsize);
 	case 0: 
 	    return ctl_reply(INET_REP_OK, NULL, 0, rbuf, rsize);
-	default:  /* active/passive change!! */
+	case 1:
 	    /*
 	     * Let's hope that the descriptor really is a tcp_descriptor here.
 	     */
+	    /* fprintf(stderr,"Triggered tcp_deliver by setopt.\r\n"); */
 	    tcp_deliver((tcp_descriptor *) desc, 0);
 	    return ctl_reply(INET_REP_OK, NULL, 0, rbuf, rsize);
+	default:  
+	    /* fprintf(stderr,"Triggered tcp_recv by setopt.\r\n"); */
+	    /*
+	     * Same as above, but active changed to once w/o header type
+	     * change, so try a read instead of just deliver. 
+	     */
+	    tcp_recv((tcp_descriptor *) desc, 0);
+	    return ctl_reply(INET_REP_OK, NULL, 0, rbuf, rsize);
 	}
     }
 
@@ -9196,6 +9214,7 @@ static int tcp_inet_input(tcp_descriptor* desc, HANDLE event)
 #endif
     ASSERT(!INETP(desc)->is_ignored);
     DEBUGF(("tcp_inet_input(%ld) {s=%d\r\n", port, desc->inet.s));
+    /* XXX fprintf(stderr,"tcp_inet_input(%ld) {s=%d}\r\n",(long) desc->inet.port, desc->inet.s); */
     if (desc->inet.state == INET_STATE_ACCEPTING) {
 	SOCKET s;
 	unsigned int len;
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index c74a258af9..0c53b1e85b 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -2044,7 +2044,7 @@ send_timeout_active(Config) when is_list(Config) ->
 		?line {error,timeout} = 
 		    Loop(fun() ->
 				 receive
-				     {tcp, Sock, _Data} ->
+				     {tcp, _Sock, _Data} ->
 					 inet:setopts(A, [{active, once}]),
 					 Res = gen_tcp:send(A,lists:duplicate(1000, $a)),
 					 %erlang:display(Res),
@@ -2536,7 +2536,7 @@ otp_8102_do(LSocket, PortNum, {Bin,PType}) ->
 otp_9389(doc) -> ["Verify packet_size handles long HTTP header lines"];
 otp_9389(suite) -> [];
 otp_9389(Config) when is_list(Config) ->
-    ?line {ok, LS} = gen_tcp:listen(0, []),
+    ?line {ok, LS} = gen_tcp:listen(0, [{active,false}]),
     ?line {ok, {_, PortNum}} = inet:sockname(LS),
     io:format("Listening on ~w with port number ~p\n", [LS, PortNum]),
     OrigLinkHdr = "/" ++ string:chars($S, 8192),