[esock] Types and cleanup

Changed tag type tpo opaque. Also added connect (monitor and
process) cleanup.

OTP-15731

1 files changed, 15 insertions, 2 deletions

diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c
index 1a8ce89b7b..4394e7bc7c 100644
--- a/erts/emulator/nifs/common/socket_nif.c
+++ b/erts/emulator/nifs/common/socket_nif.c
@@ -4966,7 +4966,7 @@ ERL_NIF_TERM nconnect(ErlNifEnv*       env,
 
         descP->state      = SOCKET_STATE_CONNECTED;
         enif_set_pid_undefined(&descP->connPid);
-        MON_INIT(&descP->connMon);
+        DEMONP("nconnect -> connected", env, descP, &descP->connMon);
         descP->isReadable = TRUE;
         descP->isWritable = TRUE;
 
@@ -5026,7 +5026,7 @@ ERL_NIF_TERM nfinalize_connection(ErlNifEnv*       env,
 {
     int error;
 
-    if (descP->state != SOCKET_STATE_CONNECTING)
+    if (!IS_CONNECTING(descP))
         return esock_make_error(env, atom_enotconn);
 
     if (!verify_is_connected(descP, &error)) {
@@ -5035,6 +5035,8 @@ ERL_NIF_TERM nfinalize_connection(ErlNifEnv*       env,
     }
 
     descP->state      = SOCKET_STATE_CONNECTED;
+    enif_set_pid_undefined(&descP->connPid);
+    DEMONP("nfinalize_connection -> connected", env, descP, &descP->connMon);
     descP->isReadable = TRUE;
     descP->isWritable = TRUE;
 
@@ -18705,6 +18707,17 @@ void socket_down(ErlNifEnv*           env,
                                   MON2T(env, mon));
             }
 
+        } else if (COMPARE_PIDS(&descP->connPid, pid) == 0) {
+
+            /* The connPid is only set during the connection.
+             * The same goes for the monitor (connMon).
+             */
+
+            descP->state = SOCKET_STATE_OPEN;  /* restore state */
+            enif_set_pid_undefined(&descP->connPid);
+            DEMONP("socket_down -> connector",
+                   env, descP, &descP->connMon);
+
         } else {
 
             /* check all operation queue(s): acceptor, writer and reader.