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

Timestamp:

2024-10-04T19:23:16Z (8 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

c7ecd290

Parents:

5132379

Message:

Implement telnet window size option

File:

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

uspace/srv/hid/remcons/user.c

@@ -58 +58 @@
 static LIST_INITIALIZE(users);
 
+static errno_t telnet_user_send_raw_locked(telnet_user_t *, const void *,
+    size_t);
+static errno_t telnet_user_flush_locked(telnet_user_t *);
+
 /** Create new telnet user.
  *
  * @param conn Incoming connection.
+ * @param cb Callback functions
+ * @param arg Argument to callback functions
  * @return New telnet user or NULL when out of memory.
  */
-telnet_user_t *telnet_user_create(tcp_conn_t *conn)
+telnet_user_t *telnet_user_create(tcp_conn_t *conn, telnet_cb_t *cb, void *arg)
 {
         static int telnet_user_id_counter = 0;
@@ -72 +78 @@
         }
 
+        user->cb = cb;
+        user->arg = arg;
         user->id = ++telnet_user_id_counter;
 
@@ -216 +224 @@
  * @return EOK on success or an error code
  */
-static errno_t telnet_user_recv_next_byte_locked(telnet_user_t *user, char *byte)
+static errno_t telnet_user_recv_next_byte_locked(telnet_user_t *user,
+    uint8_t *byte)
 {
         errno_t rc;
@@ -227 +236 @@
         }
 
-        *byte = user->socket_buffer[user->socket_buffer_pos++];
+        *byte = (uint8_t)user->socket_buffer[user->socket_buffer_pos++];
         return EOK;
 }
@@ -241 +250 @@
 }
 
-/** Process telnet command (currently only print to screen).
+static errno_t telnet_user_send_opt(telnet_user_t *user, telnet_cmd_t cmd,
+    telnet_cmd_t opt)
+{
+        uint8_t cmdb[3];
+
+        cmdb[0] = TELNET_IAC;
+        cmdb[1] = cmd;
+        cmdb[2] = opt;
+
+        return telnet_user_send_raw_locked(user, (char *)cmdb, sizeof(cmdb));
+}
+
+/** Process telnet WILL NAWS command.
+ *
+ * @param user Telnet user structure.
+ * @param cmd Telnet command.
+ */
+static void process_telnet_will_naws(telnet_user_t *user)
+{
+        telnet_user_log(user, "WILL NAWS");
+        /* Send DO NAWS */
+        (void) telnet_user_send_opt(user, TELNET_DO, TELNET_NAWS);
+        (void) telnet_user_flush_locked(user);
+}
+
+/** Process telnet SB NAWS command.
+ *
+ * @param user Telnet user structure.
+ * @param cmd Telnet command.
+ */
+static void process_telnet_sb_naws(telnet_user_t *user)
+{
+        uint8_t chi, clo;
+        uint8_t rhi, rlo;
+        uint16_t cols;
+        uint16_t rows;
+        uint8_t iac;
+        uint8_t se;
+        errno_t rc;
+
+        telnet_user_log(user, "SB NAWS...");
+
+        rc = telnet_user_recv_next_byte_locked(user, &chi);
+        if (rc != EOK)
+                return;
+        rc = telnet_user_recv_next_byte_locked(user, &clo);
+        if (rc != EOK)
+                return;
+
+        rc = telnet_user_recv_next_byte_locked(user, &rhi);
+        if (rc != EOK)
+                return;
+        rc = telnet_user_recv_next_byte_locked(user, &rlo);
+        if (rc != EOK)
+                return;
+
+        rc = telnet_user_recv_next_byte_locked(user, &iac);
+        if (rc != EOK)
+                return;
+        rc = telnet_user_recv_next_byte_locked(user, &se);
+        if (rc != EOK)
+                return;
+
+        cols = (chi << 8) | clo;
+        rows = (rhi << 8) | rlo;
+
+        telnet_user_log(user, "cols=%u rows=%u\n", cols, rows);
+
+        if (cols < 1 || rows < 1) {
+                telnet_user_log(user, "Ignoring invalid window size update.");
+                return;
+        }
+
+        user->cb->ws_update(user->arg, cols, rows);
+}
+
+/** Process telnet WILL command.
+ *
+ * @param user Telnet user structure.
+ * @param opt Option code.
+ */
+static void process_telnet_will(telnet_user_t *user, telnet_cmd_t opt)
+{
+        telnet_user_log(user, "WILL");
+        switch (opt) {
+        case TELNET_NAWS:
+                process_telnet_will_naws(user);
+                return;
+        }
+
+        telnet_user_log(user, "Ignoring telnet command %u %u %u.",
+            TELNET_IAC, TELNET_WILL, opt);
+}
+
+/** Process telnet SB command.
+ *
+ * @param user Telnet user structure.
+ * @param opt Option code.
+ */
+static void process_telnet_sb(telnet_user_t *user, telnet_cmd_t opt)
+{
+        telnet_user_log(user, "SB");
+        switch (opt) {
+        case TELNET_NAWS:
+                process_telnet_sb_naws(user);
+                return;
+        }
+
+        telnet_user_log(user, "Ignoring telnet command %u %u %u.",
+            TELNET_IAC, TELNET_SB, opt);
+}
+
+/** Process telnet command.
  *
  * @param user Telnet user structure.
@@ -250 +371 @@
     telnet_cmd_t option_code, telnet_cmd_t cmd)
 {
+        switch (option_code) {
+        case TELNET_SB:
+                process_telnet_sb(user, cmd);
+                return;
+        case TELNET_WILL:
+                process_telnet_will(user, cmd);
+                return;
+        }
+
         if (option_code != 0) {
                 telnet_user_log(user, "Ignoring telnet command %u %u %u.",
@@ -277 +407 @@
 
         do {
-                char next_byte = 0;
+                uint8_t next_byte = 0;
                 bool inside_telnet_command = false;
 
@@ -290 +420 @@
                                 return rc;
                         }
-                        uint8_t byte = (uint8_t) next_byte;
+                        uint8_t byte = next_byte;
 
                         /* Skip telnet commands. */
@@ -296 +426 @@
                                 inside_telnet_command = false;
                                 next_byte = 0;
-                                if (TELNET_IS_OPTION_CODE(byte)) {
+                                if (TELNET_IS_OPTION_CODE(byte) ||
+                                    byte == TELNET_SB) {
                                         telnet_option_code = byte;
                                         inside_telnet_command = true;
@@ -430 +561 @@
 }
 
+static errno_t telnet_user_flush_locked(telnet_user_t *user)
+{
+        errno_t rc;
+
+        rc = tcp_conn_send(user->conn, user->send_buf, user->send_buf_used);
+        if (rc != EOK)
+                return rc;
+
+        user->send_buf_used = 0;
+        return EOK;
+}
+
 errno_t telnet_user_flush(telnet_user_t *user)
 {
@@ -435 +578 @@
 
         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;
+        rc = telnet_user_flush_locked(user);
         fibril_mutex_unlock(&user->guard);
-        return EOK;
+        return rc;
 }
 
@@ -467 +603 @@
 }
 
+/** Resize telnet session.
+ *
+ * @param user Telnet user
+ * @param cols New number of columns
+ * @param rows New number of rows
+ */
+void telnet_user_resize(telnet_user_t *user, unsigned cols, unsigned rows)
+{
+        user->cols = cols;
+        user->rows = rows;
+        if ((unsigned)user->cursor_x > cols - 1)
+                user->cursor_x = cols - 1;
+        if ((unsigned)user->cursor_y > rows - 1)
+                user->cursor_y = rows - 1;
+}
+
 /**
  * @}