Changes in uspace/srv/hid/remcons/remcons.c [f9b2cb4c:902f0906] in mainline

File:

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

uspace/srv/hid/remcons/remcons.c

@@ -40 +40 @@
 #include <str_error.h>
 #include <loc.h>
+#include <event.h>
 #include <io/keycode.h>
 #include <align.h>
 #include <fibril_synch.h>
 #include <task.h>
-#include <inet/addr.h>
-#include <inet/endpoint.h>
-#include <inet/tcp.h>
+#include <net/in.h>
+#include <net/inet.h>
+#include <net/socket.h>
 #include <io/console.h>
 #include <inttypes.h>
@@ -99 +100 @@
 };
 
-static void remcons_new_conn(tcp_listener_t *lst, tcp_conn_t *conn);
-
-static tcp_listen_cb_t listen_cb = {
-        .new_conn = remcons_new_conn
-};
-
-static tcp_cb_t conn_cb = {
-        .connected = NULL
-};
-
 static telnet_user_t *srv_to_user(con_srv_t *srv)
 {
@@ -121 +112 @@
 
         /* Force character mode. */
-        (void) tcp_conn_send(user->conn, (void *)telnet_force_character_mode_command,
-            telnet_force_character_mode_command_count);
+        send(user->socket, (void *)telnet_force_character_mode_command,
+            telnet_force_character_mode_command_count, 0);
 
         return EOK;
@@ -217 +208 @@
 {
         /* Find the user. */
-        telnet_user_t *user = telnet_user_get_for_client_connection(IPC_GET_ARG2(*icall));
+        telnet_user_t *user = telnet_user_get_for_client_connection(IPC_GET_ARG1(*icall));
         if (user == NULL) {
                 async_answer_0(iid, ENOENT);
@@ -234 +225 @@
 {
         telnet_user_t *user = arg;
-        
+        int rc;
+
+        char term[LOC_NAME_MAXLEN];
+        snprintf(term, LOC_NAME_MAXLEN, "%s/%s", "/loc", user->service_name);
+
         task_id_t task;
-        task_wait_t wait;
-        int rc = task_spawnl(&task, &wait, APP_GETTERM, APP_GETTERM, user->service_name,
-            "/loc", "--msg", "--", APP_SHELL, NULL);
-        if (rc != EOK) {
-                telnet_user_error(user, "Spawning `%s %s /loc --msg -- %s' "
-                    "failed: %s.", APP_GETTERM, user->service_name, APP_SHELL,
-                    str_error(rc));
+        rc = task_spawnl(&task, APP_GETTERM, APP_GETTERM, "-w", term, APP_SHELL, NULL);
+        if (rc != EOK) {
+                telnet_user_error(user, "Spawning `%s -w %s %s' failed: %s.",
+                    APP_GETTERM, term, APP_SHELL, str_error(rc));
                 fibril_mutex_lock(&user->guard);
                 user->task_finished = true;
@@ -257 +249 @@
         task_exit_t task_exit;
         int task_retval;
-        task_wait(&wait, &task_exit, &task_retval);
+        task_wait(task, &task_exit, &task_retval);
         telnet_user_log(user, "%s terminated %s, exit code %d.", APP_GETTERM,
             task_exit == TASK_EXIT_NORMAL ? "normally" : "unexpectedly",
@@ -282 +274 @@
 }
 
-/** Handle network connection.
- *
- * @param lst  Listener
- * @param conn Connection
- */
-static void remcons_new_conn(tcp_listener_t *lst, tcp_conn_t *conn)
-{
-        telnet_user_t *user = telnet_user_create(conn);
-        assert(user);
-
-        con_srvs_init(&user->srvs);
-        user->srvs.ops = &con_ops;
-        user->srvs.sarg = user;
-        user->srvs.abort_timeout = 1000;
-
-        telnet_user_add(user);
+/** Fibril for each accepted socket.
+ *
+ * @param arg Corresponding @c telnet_user_t structure.
+ */
+static int network_user_fibril(void *arg)
+{
+        telnet_user_t *user = arg;
 
         int rc = loc_service_register(user->service_name, &user->service_id);
@@ -303 +286 @@
                 telnet_user_error(user, "Unable to register %s with loc: %s.",
                     user->service_name, str_error(rc));
-                return;
+                return EOK;
         }
 
         telnet_user_log(user, "Service %s registerd with id %" PRIun ".",
             user->service_name, user->service_id);
-
+        
         fid_t spawn_fibril = fibril_create(spawn_task_fibril, user);
         assert(spawn_fibril);
         fibril_add_ready(spawn_fibril);
-
+        
         /* Wait for all clients to exit. */
         fibril_mutex_lock(&user->guard);
         while (!user_can_be_destroyed_no_lock(user)) {
                 if (user->task_finished) {
-                        user->conn = NULL;
+                        closesocket(user->socket);
                         user->socket_closed = true;
                         user->srvs.aborted = true;
@@ -329 +312 @@
         }
         fibril_mutex_unlock(&user->guard);
-
+        
         rc = loc_service_unregister(user->service_id);
         if (rc != EOK) {
@@ -339 +322 @@
         telnet_user_log(user, "Destroying...");
         telnet_user_destroy(user);
+
+        return EOK;
 }
 
 int main(int argc, char *argv[])
 {
-        int rc;
-        tcp_listener_t *lst;
-        tcp_t *tcp;
-        inet_ep_t ep;
-
-        async_set_fallback_port_handler(client_connection, NULL);
-        rc = loc_server_register(NAME);
+        int port = 2223;
+        
+        async_set_client_connection(client_connection);
+        int rc = loc_server_register(NAME);
         if (rc != EOK) {
                 fprintf(stderr, "%s: Unable to register server\n", NAME);
                 return rc;
         }
-
-        rc = tcp_create(&tcp);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Error initializing TCP.\n", NAME);
-                return rc;
-        }
-
-        inet_ep_init(&ep);
-        ep.port = 2223;
-
-        rc = tcp_listener_create(tcp, &ep, &listen_cb, NULL, &conn_cb, NULL,
-            &lst);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Error creating listener.\n", NAME);
-                return rc;
+        
+        struct sockaddr_in addr;
+        
+        addr.sin_family = AF_INET;
+        addr.sin_port = htons(port);
+        
+        rc = inet_pton(AF_INET, "127.0.0.1", (void *)
+            &addr.sin_addr.s_addr);
+        if (rc != EOK) {
+                fprintf(stderr, "Error parsing network address: %s.\n",
+                    str_error(rc));
+                return 2;
+        }
+
+        int listen_sd = socket(PF_INET, SOCK_STREAM, 0);
+        if (listen_sd < 0) {
+                fprintf(stderr, "Error creating listening socket: %s.\n",
+                    str_error(listen_sd));
+                return 3;
+        }
+
+        rc = bind(listen_sd, (struct sockaddr *) &addr, sizeof(addr));
+        if (rc != EOK) {
+                fprintf(stderr, "Error binding socket: %s.\n",
+                    str_error(rc));
+                return 4;
+        }
+
+        rc = listen(listen_sd, BACKLOG_SIZE);
+        if (rc != EOK) {
+                fprintf(stderr, "listen() failed: %s.\n", str_error(rc));
+                return 5;
         }
 
         printf("%s: HelenOS Remote console service\n", NAME);
         task_retval(0);
-        async_manager();
-
-        /* Not reached */
+
+        while (true) {
+                struct sockaddr_in raddr;
+                socklen_t raddr_len = sizeof(raddr);
+                int conn_sd = accept(listen_sd, (struct sockaddr *) &raddr,
+                    &raddr_len);
+
+                if (conn_sd < 0) {
+                        fprintf(stderr, "accept() failed: %s.\n",
+                            str_error(rc));
+                        continue;
+                }
+
+                telnet_user_t *user = telnet_user_create(conn_sd);
+                assert(user);
+
+                con_srvs_init(&user->srvs);
+                user->srvs.ops = &con_ops;
+                user->srvs.sarg = user;
+                user->srvs.abort_timeout = 1000;
+
+                telnet_user_add(user);
+
+                fid_t fid = fibril_create(network_user_fibril, user);
+                assert(fid);
+                fibril_add_ready(fid);
+        }
+
         return 0;
 }