Changeset fab2746 in mainline for uspace/srv/hid/remcons

Timestamp:

2015-04-08T21:25:30Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

99ea91b2

Parents:

ba0eac5

Message:

New transport layer API. Only UDP implemented.

Location:

uspace/srv/hid/remcons

Files:

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

uspace/srv/hid/remcons/remcons.c

@@ -44 +44 @@
 #include <fibril_synch.h>
 #include <task.h>
-#include <net/in.h>
-#include <net/inet.h>
-#include <net/socket.h>
+#include <inet/addr.h>
+#include <inet/endpoint.h>
+#include <inet/tcp.h>
 #include <io/console.h>
 #include <inttypes.h>
@@ -99 +99 @@
 };
 
+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)
 {
@@ -111 +121 @@
 
         /* Force character mode. */
-        send(user->socket, (void *)telnet_force_character_mode_command,
-            telnet_force_character_mode_command_count, 0);
+        (void) tcp_conn_send(user->conn, (void *)telnet_force_character_mode_command,
+            telnet_force_character_mode_command_count);
 
         return EOK;
@@ -298 +308 @@
         while (!user_can_be_destroyed_no_lock(user)) {
                 if (user->task_finished) {
-                        closesocket(user->socket);
+                        tcp_conn_destroy(user->conn);
+                        user->conn = NULL;
                         user->socket_closed = true;
                         user->srvs.aborted = true;
@@ -324 +335 @@
 }
 
+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);
+
+        fid_t fid = fibril_create(network_user_fibril, user);
+        assert(fid);
+        fibril_add_ready(fid);
+}
+
 int main(int argc, char *argv[])
 {
-        int port = 2223;
-        
+        int rc;
+        tcp_listener_t *lst;
+        tcp_t *tcp;
+        inet_ep_t ep;
+
         async_set_client_connection(client_connection);
-        int rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME);
         if (rc != EOK) {
                 fprintf(stderr, "%s: Unable to register server\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;
+
+        rc = tcp_create(&tcp);
+        if (tcp != EOK) {
+                fprintf(stderr, "%s: Error initialzing 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;
         }
 
         printf("%s: HelenOS Remote console service\n", NAME);
         task_retval(0);
-
-        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);
-        }
-
+        async_manager();
+
+        /* Not reached */
         return 0;
 }

uspace/srv/hid/remcons/remcons.h

@@ -38 +38 @@
 #define NAME       "remcons"
 #define NAMESPACE  "term"
-#define BACKLOG_SIZE  5
 
 #endif

uspace/srv/hid/remcons/user.c

@@ -44 +44 @@
 #include <fibril_synch.h>
 #include <task.h>
-#include <net/in.h>
-#include <net/inet.h>
-#include <net/socket.h>
+#include <inet/tcp.h>
 #include <io/console.h>
 #include <inttypes.h>
@@ -58 +56 @@
 /** Create new telnet user.
  *
- * @param socket Socket the user communicates through.
+ * @param conn Incoming connection.
  * @return New telnet user or NULL when out of memory.
  */
-telnet_user_t *telnet_user_create(int socket)
+telnet_user_t *telnet_user_create(tcp_conn_t *conn)
 {
         static int telnet_user_id_counter = 0;
@@ -78 +76 @@
         }
 
-        user->socket = socket;
+        user->conn = conn;
         user->service_id = (service_id_t) -1;
         prodcons_initialize(&user->in_events);
@@ -193 +191 @@
         /* No more buffered data? */
         if (user->socket_buffer_len <= user->socket_buffer_pos) {
-                int recv_length = recv(user->socket, user->socket_buffer, BUFFER_SIZE, 0);
-                if ((recv_length == 0) || (recv_length == ENOTCONN)) {
+                int rc;
+                size_t recv_length;
+
+                rc = tcp_conn_recv_wait(user->conn, user->socket_buffer,
+                    BUFFER_SIZE, &recv_length);
+                if (rc != EOK)
+                        return rc;
+
+                if (recv_length == 0) {
                         user->socket_closed = true;
                         user->srvs.aborted = true;
                         return ENOENT;
                 }
-                if (recv_length < 0) {
-                        return recv_length;
-                }
+
                 user->socket_buffer_len = recv_length;
                 user->socket_buffer_pos = 0;
@@ -359 +362 @@
 
 
-        int rc = send(user->socket, converted, converted_size, 0);
+        int rc = tcp_conn_send(user->conn, converted, converted_size);
         free(converted);
 

uspace/srv/hid/remcons/user.h

@@ -38 +38 @@
 #include <adt/prodcons.h>
 #include <fibril_synch.h>
+#include <inet/tcp.h>
 #include <inttypes.h>
 #include <io/con_srv.h>
@@ -51 +52 @@
         /** Internal id, used for creating locfs entries. */
         int id;
-        /** Associated socket. */
-        int socket;
+        /** Associated connection. */
+        tcp_conn_t *conn;
         /** Location service id assigned to the virtual terminal. */
         service_id_t service_id;
@@ -80 +81 @@
 } telnet_user_t;
 
-extern telnet_user_t *telnet_user_create(int);
+extern telnet_user_t *telnet_user_create(tcp_conn_t *);
 extern void telnet_user_add(telnet_user_t *);
 extern void telnet_user_destroy(telnet_user_t *);