Changeset 7880d58 in mainline

Timestamp:

2010-12-16T18:39:08Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cc274f5a

Parents:

f87c900

Message:

Remove data_receive() in favor of standard async_data_write_accept().

Location:

uspace

Files:

• lib/c/generic/net/modules.c (modified) (1 diff)
• srv/net/il/ip/ip.c (modified) (1 diff)
• srv/net/tl/tcp/tcp.c (modified) (3 diffs)
• srv/net/tl/udp/udp.c (modified) (2 diffs)

uspace/lib/c/generic/net/modules.c

@@ -198 +198 @@
 }
 
-/** Receives data from the other party.
- *
- * The received data buffer is allocated and returned.
- *
- * @param[out] data     The data buffer to be filled.
- * @param[out] length   The buffer length.
- * @return              EOK on success.
- * @return              EBADMEM if the data or the length parameter is NULL.
- * @return              EINVAL if the client does not send data.
- * @return              ENOMEM if there is not enough memory left.
- * @return              Other error codes as defined for the
- *                      async_data_write_finalize() function.
- */
-int data_receive(void **data, size_t *length)
-{
-        ipc_callid_t callid;
-        int rc;
-
-        if (!data || !length)
-                return EBADMEM;
-
-        // fetch the request
-        if (!async_data_write_receive(&callid, length))
-                return EINVAL;
-
-        // allocate the buffer
-        *data = malloc(*length);
-        if (!*data)
-                return ENOMEM;
-
-        // fetch the data
-        rc = async_data_write_finalize(callid, *data, *length);
-        if (rc != EOK) {
-                free(data);
-                return rc;
-        }
-
-        return EOK;
-}
-
 /** Replies the data to the other party.
  *

uspace/srv/net/il/ip/ip.c

@@ -1949 +1949 @@
 
         case NET_IP_GET_ROUTE:
-                rc = data_receive((void **) &addr, &addrlen);
+                rc = async_data_write_accept((void **) &addr, false, 0, 0, 0,
+                    &addrlen);
                 if (rc != EOK)
                         return rc;

uspace/srv/net/tl/tcp/tcp.c

@@ -1365 +1365 @@
 
                 case NET_SOCKET_BIND:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;
@@ -1402 +1403 @@
 
                 case NET_SOCKET_CONNECT:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;
@@ -1453 +1455 @@
 
                 case NET_SOCKET_SENDTO:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;

uspace/srv/net/tl/udp/udp.c

@@ -771 +771 @@
 
                 case NET_SOCKET_BIND:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;
@@ -784 +785 @@
 
                 case NET_SOCKET_SENDTO:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;