Changeset 89e5c0c7 in mainline

Timestamp:

2024-10-01T09:43:36Z (4 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

357d9dd

Parents:

c23a1fe

git-author:

Jiri Svoboda <jiri@…> (2024-09-30 17:43:19)

git-committer:

Jiri Svoboda <jiri@…> (2024-10-01 09:43:36)

Message:

Control sequences must not alter telnet user's cursor_x/y

Location:

uspace/srv/hid/remcons

Files:

• remcons.c (modified) (1 diff)
• user.c (modified) (7 diffs)
• user.h (modified) (1 diff)

uspace/srv/hid/remcons/remcons.c

@@ -532 +532 @@
         remcons_t *remcons = (remcons_t *)arg;
 
-        (void)telnet_user_send_data(remcons->user, str, str_size(str));
+        (void)telnet_user_send_raw(remcons->user, str, str_size(str));
 }
 

uspace/srv/hid/remcons/user.c

@@ -215 +215 @@
  * might be negative.
  */
-static errno_t telnet_user_recv_next_byte_no_lock(telnet_user_t *user, char *byte)
+static errno_t telnet_user_recv_next_byte_locked(telnet_user_t *user, char *byte)
 {
         errno_t rc;
@@ -322 +322 @@
                         fibril_mutex_unlock(&user->guard);
 
-                        errno_t rc = telnet_user_recv_next_byte_no_lock(user, &next_byte);
+                        errno_t rc = telnet_user_recv_next_byte_locked(user, &next_byte);
                         if (rc != EOK)
                                 return rc;
@@ -372 +372 @@
 }
 
-static errno_t telnet_user_send_raw(telnet_user_t *user,
+static errno_t telnet_user_send_raw_locked(telnet_user_t *user,
     const void *data, size_t size)
 {
@@ -408 +408 @@
  * @param size Size of @p data buffer in bytes.
  */
-static errno_t telnet_user_send_data_no_lock(telnet_user_t *user,
+static errno_t telnet_user_send_data_locked(telnet_user_t *user,
     const char *data, size_t size)
 {
@@ -433 +433 @@
         }
 
-        errno_t rc = telnet_user_send_raw(user, converted, converted_size);
+        errno_t rc = telnet_user_send_raw_locked(user, converted,
+            converted_size);
         free(converted);
 
@@ -450 +451 @@
         fibril_mutex_lock(&user->guard);
 
-        errno_t rc = telnet_user_send_data_no_lock(user, data, size);
+        errno_t rc = telnet_user_send_data_locked(user, data, size);
+
+        fibril_mutex_unlock(&user->guard);
+
+        return rc;
+}
+
+/** Send raw non-printable data to the socket.
+ *
+ * @param user Telnet user.
+ * @param data Data buffer (not zero terminated).
+ * @param size Size of @p data buffer in bytes.
+ */
+errno_t telnet_user_send_raw(telnet_user_t *user, const char *data,
+    size_t size)
+{
+        fibril_mutex_lock(&user->guard);
+
+        errno_t rc = telnet_user_send_raw_locked(user, data, size);
 
         fibril_mutex_unlock(&user->guard);
@@ -487 +506 @@
                 char data = '\b';
                 /* Ignore errors. */
-                telnet_user_send_data_no_lock(user, &data, 1);
+                telnet_user_send_data_locked(user, &data, 1);
         }
         user->cursor_x = new_x;

uspace/srv/hid/remcons/user.h

@@ -98 +98 @@
 extern errno_t telnet_user_get_next_keyboard_event(telnet_user_t *, kbd_event_t *);
 extern errno_t telnet_user_send_data(telnet_user_t *, const char *, size_t);
+extern errno_t telnet_user_send_raw(telnet_user_t *, const char *, size_t);
 extern errno_t telnet_user_flush(telnet_user_t *);
 extern errno_t telnet_user_recv(telnet_user_t *, void *, size_t, size_t *);