Changeset 5be5396 in mainline

Timestamp:

2024-10-11T16:08:55Z (3 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

b3b79981

Parents:

fb06afd

Message:

Remcons needs to properly clean up when terminating a user session

Location:

uspace

Files:

• lib/console/src/con_srv.c (modified) (1 diff)
• lib/vt/include/vt/vt100.h (modified) (1 diff)
• lib/vt/src/vt100.c (modified) (1 diff)
• srv/hid/remcons/remcons.c (modified) (4 diffs)

uspace/lib/console/src/con_srv.c

@@ -466 +466 @@
                 }
 
-                if (!received)
+                if (!received || srv->srvs->aborted)
                         break;
 

uspace/lib/vt/include/vt/vt100.h

@@ -179 +179 @@
 extern void vt100_set_pos(vt100_t *, sysarg_t, sysarg_t);
 extern void vt100_goto(vt100_t *, sysarg_t, sysarg_t);
+extern void vt100_sgr(vt100_t *, unsigned int);
 extern void vt100_set_sgr(vt100_t *, char_attrs_t);
 extern void vt100_set_attr(vt100_t *, char_attrs_t);

uspace/lib/vt/src/vt100.c

@@ -66 +66 @@
  * @param mode SGR mode number
  */
-static void vt100_sgr(vt100_t *vt, unsigned int mode)
+void vt100_sgr(vt100_t *vt, unsigned int mode)
 {
         char control[MAX_CONTROL];

uspace/srv/hid/remcons/remcons.c

@@ -739 +739 @@
         user->srvs.ops = &con_ops;
         user->srvs.sarg = remcons;
-        user->srvs.abort_timeout = 1000;
+        user->srvs.abort_timeout = 1000000;
 
         telnet_user_add(user);
@@ -765 +765 @@
         while (!user_can_be_destroyed_no_lock(user)) {
                 if (user->task_finished) {
-                        user->conn = NULL;
                         user->socket_closed = true;
                         user->srvs.aborted = true;
-                        continue;
                 } else if (user->socket_closed) {
                         if (user->task_id != 0) {
@@ -774 +772 @@
                         }
                 }
-                fibril_condvar_wait_timeout(&user->refcount_cv, &user->recv_lock, 1000);
+                fibril_condvar_wait_timeout(&user->refcount_cv,
+                    &user->recv_lock, 1000000);
         }
         fibril_mutex_unlock(&user->recv_lock);
@@ -786 +785 @@
 
         telnet_user_log(user, "Destroying...");
+
+        if (remcons->enable_ctl) {
+                /* Disable mouse tracking */
+                vt100_set_button_reporting(remcons->vt, false);
+
+                /* Reset all character attributes and clear screen */
+                vt100_sgr(remcons->vt, 0);
+                vt100_cls(remcons->vt);
+                vt100_set_pos(remcons->vt, 0, 0);
+
+                telnet_user_flush(user);
+        }
+
+        tcp_conn_send_fin(user->conn);
+        user->conn = NULL;
+
         telnet_user_destroy(user);
+        vt100_destroy(remcons->vt);
+        free(remcons);
         return;
 error: