Changeset b5e68c8 in mainline for uspace/lib/net/tl/tl_common.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/tl/tl_common.c (modified) (14 diffs)

uspace/lib/net/tl/tl_common.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libnet 
+/** @addtogroup libnet
  * @{
  */
@@ -39 +39 @@
 #include <packet_client.h>
 #include <packet_remote.h>
-#include <icmp_interface.h>
+#include <icmp_remote.h>
 #include <ip_remote.h>
 #include <ip_interface.h>
-#include <tl_interface.h>
+#include <tl_remote.h>
 
 #include <net/socket_codes.h>
@@ -54 +54 @@
 #include <ipc/services.h>
 #include <errno.h>
-#include <err.h>
 
 DEVICE_MAP_IMPLEMENT(packet_dimensions, packet_dimension_t);
@@ -65 +64 @@
  * @param[in] addrlen   The address length.
  * @param[out] port     The set port.
- * @returns             EOK on success.
- * @returns             EINVAL if the address length does not match the address
+ * @return              EOK on success.
+ * @return              EINVAL if the address length does not match the address
  *                      family.
- * @returns             EAFNOSUPPORT if the address family is not supported.
+ * @return              EAFNOSUPPORT if the address family is not supported.
  */
 int
@@ -121 +120 @@
 int
 tl_get_ip_packet_dimension(int ip_phone,
-    packet_dimensions_ref packet_dimensions, device_id_t device_id,
-    packet_dimension_ref *packet_dimension)
-{
-        ERROR_DECLARE;
+    packet_dimensions_t *packet_dimensions, device_id_t device_id,
+    packet_dimension_t **packet_dimension)
+{
+        int rc;
         
         if (!packet_dimension)
@@ -137 +136 @@
                         return ENOMEM;
                 
-                if (ERROR_OCCURRED(ip_packet_size_req(ip_phone, device_id,
-                    *packet_dimension))) {
+                rc = ip_packet_size_req(ip_phone, device_id, *packet_dimension);
+                if (rc != EOK) {
                         free(*packet_dimension);
-                        return ERROR_CODE;
+                        return rc;
                 }
                 
-                ERROR_CODE = packet_dimensions_add(packet_dimensions, device_id,
+                rc = packet_dimensions_add(packet_dimensions, device_id,
                     *packet_dimension);
-                if (ERROR_CODE < 0) {
+                if (rc < 0) {
                         free(*packet_dimension);
-                        return ERROR_CODE;
+                        return rc;
                 }
         }
@@ -159 +158 @@
  * @param[in] device_id The device identifier.
  * @param[in] content   The new maximum content size.
- * @returns             EOK on success.
+ * @return              EOK on success.
  * @return              ENOENT if the packet dimension is not cached.
  */
 int
-tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions,
+tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
     device_id_t device_id, size_t content)
 {
-        packet_dimension_ref packet_dimension;
+        packet_dimension_t *packet_dimension;
 
         packet_dimension = packet_dimensions_find(packet_dimensions, device_id);
@@ -183 +182 @@
                         else
                                 packet_dimensions_exclude(packet_dimensions,
-                                    DEVICE_INVALID_ID);
+                                    DEVICE_INVALID_ID, free);
                 }
         }
@@ -197 +196 @@
  * @param[in] addrlen   The address length.
  * @param[in] port      The port to be set.
- * @returns             EOK on success.
- * @returns             EINVAL if the address length does not match the address
+ * @return              EOK on success.
+ * @return              EINVAL if the address length does not match the address
  *                      family.
- * @returns             EAFNOSUPPORT if the address family is not supported.
+ * @return              EAFNOSUPPORT if the address family is not supported.
  */
 int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port)
@@ -245 +244 @@
  * @param[in] error     The packet error reporting service. Prefixes the
  *                      received packet.
- * @returns             EOK on success.
- * @returns             ENOENT if no packet may be sent.
- */
-int
-tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t packet,
+ * @return              EOK on success.
+ * @return              ENOENT if no packet may be sent.
+ */
+int
+tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t *packet,
     services_t error)
 {
-        packet_t next;
+        packet_t *next;
         uint8_t *src;
         int length;
 
-        // detach the first packet and release the others
+        /* Detach the first packet and release the others */
         next = pq_detach(packet);
         if (next)
@@ -263 +262 @@
         length = packet_get_addr(packet, &src, NULL);
         if ((length > 0) && (!error) && (icmp_phone >= 0) &&
-            // set both addresses to the source one (avoids the source address
-            // deletion before setting the destination one)
+            /*
+             * Set both addresses to the source one (avoids the source address
+             * deletion before setting the destination one)
+             */
             (packet_set_addr(packet, src, src, (size_t) length) == EOK)) {
                 return EOK;
@@ -281 +282 @@
  * @param[in] addr      The destination address.
  * @param[in] addrlen   The address length.
- * @returns             Number of bytes received.
- * @returns             EINVAL if the client does not send data.
- * @returns             ENOMEM if there is not enough memory left.
- * @returns             Other error codes as defined for the
+ * @return              Number of bytes received.
+ * @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_read_finalize() function.
  */
 int
-tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix,
-    const packet_dimension_ref dimension, const struct sockaddr *addr,
+tl_socket_read_packet_data(int packet_phone, packet_t **packet, size_t prefix,
+    const packet_dimension_t *dimension, const struct sockaddr *addr,
     socklen_t addrlen)
 {
-        ERROR_DECLARE;
-
         ipc_callid_t callid;
         size_t length;
-        void * data;
+        void *data;
+        int rc;
 
         if (!dimension)
                 return EINVAL;
 
-        // get the data length
+        /* Get the data length */
         if (!async_data_write_receive(&callid, &length))
                 return EINVAL;
 
-        // get a new packet
+        /* Get a new packet */
         *packet = packet_get_4_remote(packet_phone, length, dimension->addr_len,
             prefix + dimension->prefix, dimension->suffix);
@@ -311 +311 @@
                 return ENOMEM;
 
-        // allocate space in the packet
+        /* Allocate space in the packet */
         data = packet_suffix(*packet, length);
         if (!data) {
@@ -318 +318 @@
         }
 
-        // read the data into the packet
-        if (ERROR_OCCURRED(async_data_write_finalize(callid, data, length)) ||
-            // set the packet destination address
-            ERROR_OCCURRED(packet_set_addr(*packet, NULL, (uint8_t *) addr,
-            addrlen))) {
+        /* Read the data into the packet */
+        rc = async_data_write_finalize(callid, data, length);
+        if (rc != EOK) {
                 pq_release_remote(packet_phone, packet_get_id(*packet));
-                return ERROR_CODE;
+                return rc;
+        }
+        
+        /* Set the packet destination address */
+        rc = packet_set_addr(*packet, NULL, (uint8_t *) addr, addrlen);
+        if (rc != EOK) {
+                pq_release_remote(packet_phone, packet_get_id(*packet));
+                return rc;
         }