Changes in uspace/srv/hid/remcons/user.c [fab2746:5d94b16c] in mainline

File:

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

uspace/srv/hid/remcons/user.c

@@ -38 +38 @@
 #include <str_error.h>
 #include <loc.h>
+#include <event.h>
 #include <io/keycode.h>
 #include <align.h>
@@ -44 +45 @@
 #include <fibril_synch.h>
 #include <task.h>
-#include <inet/tcp.h>
+#include <net/in.h>
+#include <net/inet.h>
+#include <net/socket.h>
 #include <io/console.h>
 #include <inttypes.h>
@@ -56 +59 @@
 /** Create new telnet user.
  *
- * @param conn Incoming connection.
+ * @param socket Socket the user communicates through.
  * @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(int socket)
 {
         static int telnet_user_id_counter = 0;
@@ -76 +79 @@
         }
 
-        user->conn = conn;
+        user->socket = socket;
         user->service_id = (service_id_t) -1;
         prodcons_initialize(&user->in_events);
@@ -125 +128 @@
 
         fibril_mutex_lock(&users_guard);
-        list_foreach(users, link, telnet_user_t, tmp) {
+        list_foreach(users, link) {
+                telnet_user_t *tmp = list_get_instance(link, telnet_user_t, link);
                 if (tmp->service_id == id) {
                         user = tmp;
@@ -191 +195 @@
         /* No more buffered data? */
         if (user->socket_buffer_len <= user->socket_buffer_pos) {
-                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) {
+                int recv_length = recv(user->socket, user->socket_buffer, BUFFER_SIZE, 0);
+                if ((recv_length == 0) || (recv_length == ENOTCONN)) {
                         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;
@@ -362 +361 @@
 
 
-        int rc = tcp_conn_send(user->conn, converted, converted_size);
+        int rc = send(user->socket, converted, converted_size, 0);
         free(converted);