Changeset 8fb1bf82 in mainline for uspace/lib/net/generic/packet_remote.c

Timestamp:

2010-11-25T13:42:50Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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 mainline changes.

File:

• uspace/lib/net/generic/packet_remote.c (modified) (6 diffs)

uspace/lib/net/generic/packet_remote.c

@@ -38 +38 @@
 #include <async.h>
 #include <errno.h>
-#include <err.h>
 #include <ipc/ipc.h>
 #include <ipc/packet.h>
@@ -65 +64 @@
  */
 static int
-packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size)
-{
-        ERROR_DECLARE;
-        
+packet_return(int phone, packet_t **packet, packet_id_t packet_id, size_t size)
+{
         ipc_call_t answer;
-        aid_t message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
-
-        *packet = (packet_t) as_get_mappable_page(size);
-        if (ERROR_OCCURRED(async_share_in_start_0_0(phone, *packet, size)) ||
-            ERROR_OCCURRED(pm_add(*packet))) {
+        aid_t message;
+        int rc;
+        
+        message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
+
+        *packet = (packet_t *) as_get_mappable_page(size);
+        rc = async_share_in_start_0_0(phone, *packet, size);
+        if (rc != EOK) {
                 munmap(*packet, size);
                 async_wait_for(message, NULL);
-                return ERROR_CODE;
+                return rc;
+        }
+        rc = pm_add(*packet);
+        if (rc != EOK) {
+                munmap(*packet, size);
+                async_wait_for(message, NULL);
+                return rc;
         }
         
@@ -94 +100 @@
  * @param[out] packet   The packet reference.
  * @param[in] packet_id The packet identifier.
- * @returns             EOK on success.
- * @returns             EINVAL if the packet parameter is NULL.
- * @returns             Other error codes as defined for the NET_PACKET_GET_SIZE
+ * @return              EOK on success.
+ * @return              EINVAL if the packet parameter is NULL.
+ * @return              Other error codes as defined for the NET_PACKET_GET_SIZE
  *                      message.
- * @returns             Other error codes as defined for the packet_return()
+ * @return              Other error codes as defined for the packet_return()
  *                      function.
  */
-int packet_translate_remote(int phone, packet_ref packet, packet_id_t packet_id)
-{
-        ERROR_DECLARE;
+int packet_translate_remote(int phone, packet_t **packet, packet_id_t packet_id)
+{
+        int rc;
         
         if (!packet)
@@ -112 +118 @@
                 ipcarg_t size;
                 
-                ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE,
-                    packet_id, &size));
-                ERROR_PROPAGATE(packet_return(phone, packet, packet_id, size));
+                rc = async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id,
+                    &size);
+                if (rc != EOK)
+                        return rc;
+                rc = packet_return(phone, packet, packet_id, size);
+                if (rc != EOK)
+                        return rc;
         }
         if ((*packet)->next) {
-                packet_t next;
+                packet_t *next;
                 
                 return packet_translate_remote(phone, &next, (*packet)->next);
@@ -135 +145 @@
  * @param[in] max_content The maximal content length in bytes.
  * @param[in] max_suffix The maximal suffix length in bytes.
- * @returns             The packet reference.
- * @returns             NULL on error.
- */
-packet_t packet_get_4_remote(int phone, size_t max_content, size_t addr_len,
+ * @return              The packet reference.
+ * @return              NULL on error.
+ */
+packet_t *packet_get_4_remote(int phone, size_t max_content, size_t addr_len,
     size_t max_prefix, size_t max_suffix)
 {
-        ERROR_DECLARE;
-        
         ipcarg_t packet_id;
         ipcarg_t size;
-        
-        if (ERROR_OCCURRED(async_req_4_2(phone, NET_PACKET_CREATE_4,
-            max_content, addr_len, max_prefix, max_suffix, &packet_id, &size)))
+        int rc;
+        
+        rc = async_req_4_2(phone, NET_PACKET_CREATE_4, max_content, addr_len,
+            max_prefix, max_suffix, &packet_id, &size);
+        if (rc != EOK)
                 return NULL;
         
         
-        packet_t packet = pm_find(packet_id);
+        packet_t *packet = pm_find(packet_id);
         if (!packet) {
-                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id,
-                    size)))
+                rc = packet_return(phone, &packet, packet_id, size);
+                if (rc != EOK)
                         return NULL;
         }
@@ -167 +177 @@
  * @param[in] phone     The packet server module phone.
  * @param[in] content   The maximal content length in bytes.
- * @returns             The packet reference.
- * @returns             NULL on error.
- */
-packet_t packet_get_1_remote(int phone, size_t content)
-{
-        ERROR_DECLARE;
-        
+ * @return              The packet reference.
+ * @return              NULL on error.
+ */
+packet_t *packet_get_1_remote(int phone, size_t content)
+{
         ipcarg_t packet_id;
         ipcarg_t size;
-        
-        if (ERROR_OCCURRED(async_req_1_2(phone, NET_PACKET_CREATE_1, content,
-            &packet_id, &size)))
+        int rc;
+        
+        rc = async_req_1_2(phone, NET_PACKET_CREATE_1, content, &packet_id,
+            &size);
+        if (rc != EOK)
                 return NULL;
         
-        packet_t packet = pm_find(packet_id);
+        packet_t *packet = pm_find(packet_id);
         if (!packet) {
-                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id,
-                    size)))
+                rc = packet_return(phone, &packet, packet_id, size);
+                if (rc != EOK)
                         return NULL;
         }