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

Timestamp:

2015-07-28T11:28:14Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce3 (diff), 47726b5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from the mainline

File:

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

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);