Changeset c23a1fe in mainline for uspace/srv/hid/remcons/user.c

Timestamp:

2024-09-26T22:24:43Z (2 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

89e5c0c7

Parents:

09f41d3

Message:

Remote console mapping

File:

• uspace/srv/hid/remcons/user.c (modified) (6 diffs)

uspace/srv/hid/remcons/user.c

@@ -38 +38 @@
 #include <adt/prodcons.h>
 #include <errno.h>
+#include <macros.h>
 #include <mem.h>
 #include <str_error.h>
@@ -86 +87 @@
         user->socket_buffer_len = 0;
         user->socket_buffer_pos = 0;
+        user->send_buf_used = 0;
 
         fibril_condvar_initialize(&user->refcount_cv);
@@ -370 +372 @@
 }
 
+static errno_t telnet_user_send_raw(telnet_user_t *user,
+    const void *data, size_t size)
+{
+        size_t remain;
+        size_t now;
+        errno_t rc;
+
+        remain = sizeof(user->send_buf) - user->send_buf_used;
+        while (size > 0) {
+                if (remain == 0) {
+                        rc = tcp_conn_send(user->conn, user->send_buf,
+                            sizeof(user->send_buf));
+                        if (rc != EOK)
+                                return rc;
+
+                        user->send_buf_used = 0;
+                        remain = sizeof(user->send_buf);
+                }
+
+                now = min(remain, size);
+                memcpy(user->send_buf + user->send_buf_used, data, now);
+                user->send_buf_used += now;
+                remain -= now;
+                data += now;
+                size -= now;
+        }
+
+        return EOK;
+}
+
 /** Send data (convert them first) to the socket, no locking.
  *
@@ -389 +421 @@
                         converted[converted_size++] = 10;
                         user->cursor_x = 0;
-                        if (user->cursor_y < user->rows - 1)
+                        if (user->cursor_y < (int)user->rows - 1)
                                 ++user->cursor_y;
                 } else {
@@ -401 +433 @@
         }
 
-        errno_t rc = tcp_conn_send(user->conn, converted, converted_size);
+        errno_t rc = telnet_user_send_raw(user, converted, converted_size);
         free(converted);
 
@@ -423 +455 @@
 
         return rc;
+}
+
+errno_t telnet_user_flush(telnet_user_t *user)
+{
+        errno_t rc;
+
+        fibril_mutex_lock(&user->guard);
+        rc = tcp_conn_send(user->conn, user->send_buf, user->send_buf_used);
+
+        if (rc != EOK) {
+                fibril_mutex_unlock(&user->guard);
+                return rc;
+        }
+
+        user->send_buf_used = 0;
+        fibril_mutex_unlock(&user->guard);
+        return EOK;
 }