Changeset b5e68c8 in mainline for uspace/lib/net/il/ip_client.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/il/ip_client.c (modified) (12 diffs)

uspace/lib/net/il/ip_client.c

@@ -48 +48 @@
  *
  * @param[in] packet    The packet.
- * @returns             The IP header length in bytes.
- * @returns             Zero if there is no IP header.
- */
-size_t ip_client_header_length(packet_t packet)
-{
-        ip_header_ref header;
-
-        header = (ip_header_ref) packet_get_data(packet);
+ * @return              The IP header length in bytes.
+ * @return              Zero if there is no IP header.
+ */
+size_t ip_client_header_length(packet_t *packet)
+{
+        ip_header_t *header;
+
+        header = (ip_header_t *) packet_get_data(packet);
         if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t)))
                 return 0;
@@ -72 +72 @@
  * @param[out] header   The constructed IPv4 pseudo header.
  * @param[out] headerlen The length of the IP pseudo header in bytes.
- * @returns             EOK on success.
- * @returns             EBADMEM if the header and/or the headerlen parameter is
+ * @return              EOK on success.
+ * @return              EBADMEM if the header and/or the headerlen parameter is
  *                      NULL.
- * @returns             EINVAL if the source address and/or the destination
+ * @return              EINVAL if the source address and/or the destination
  *                      address parameter is NULL.
- * @returns             EINVAL if the source address length is less than struct
+ * @return              EINVAL if the source address length is less than struct
  *                      sockaddr length.
- * @returns             EINVAL if the source address length differs from the
+ * @return              EINVAL if the source address length differs from the
  *                      destination address length.
- * @returns             EINVAL if the source address family differs from the
+ * @return              EINVAL if the source address family differs from the
  *                      destination family.
- * @returns             EAFNOSUPPORT if the address family is not supported.
- * @returns             ENOMEM if there is not enough memory left.
+ * @return              EAFNOSUPPORT if the address family is not supported.
+ * @return              ENOMEM if there is not enough memory left.
  */
 int
@@ -91 +91 @@
     size_t data_length, void **header, size_t *headerlen)
 {
-        ipv4_pseudo_header_ref header_in;
+        ipv4_pseudo_header_t *header_in;
         struct sockaddr_in *address_in;
 
@@ -109 +109 @@
                 
                 *headerlen = sizeof(*header_in);
-                header_in = (ipv4_pseudo_header_ref) malloc(*headerlen);
+                header_in = (ipv4_pseudo_header_t *) malloc(*headerlen);
                 if (!header_in)
                         return ENOMEM;
@@ -124 +124 @@
 
         // TODO IPv6
-/*      case AF_INET6:
+#if 0
+        case AF_INET6:
                 if (addrlen != sizeof(struct sockaddr_in6))
                         return EINVAL;
@@ -130 +131 @@
                 address_in6 = (struct sockaddr_in6 *) addr;
                 return EOK;
-*/
+#endif
 
         default:
@@ -148 +149 @@
  *                      disabled.
  * @param[in] ipopt_length The prefixed IP options length in bytes.
- * @returns             EOK on success.
- * @returns             ENOMEM if there is not enough memory left in the packet.
- */
-int
-ip_client_prepare_packet(packet_t packet, ip_protocol_t protocol, ip_ttl_t ttl,
+ * @return              EOK on success.
+ * @return              ENOMEM if there is not enough memory left in the packet.
+ */
+int
+ip_client_prepare_packet(packet_t *packet, ip_protocol_t protocol, ip_ttl_t ttl,
     ip_tos_t tos, int dont_fragment, size_t ipopt_length)
 {
-        ip_header_ref header;
+        ip_header_t *header;
         uint8_t *data;
         size_t padding;
 
-        // compute the padding if IP options are set
-        // multiple of 4 bytes
+        /*
+         * Compute the padding if IP options are set
+         * multiple of 4 bytes
+         */
         padding =  ipopt_length % 4;
         if (padding) {
@@ -167 +170 @@
         }
 
-        // prefix the header
+        /* Prefix the header */
         data = (uint8_t *) packet_prefix(packet, sizeof(ip_header_t) + padding);
         if (!data)
                 return ENOMEM;
 
-        // add the padding
+        /* Add the padding */
         while (padding--)
                 data[sizeof(ip_header_t) + padding] = IPOPT_NOOP;
 
-        // set the header
-        header = (ip_header_ref) data;
+        /* Set the header */
+        header = (ip_header_t *) data;
         header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) +
             ipopt_length);
@@ -203 +206 @@
  * @param[out] ipopt_length The IP options length in bytes. May be NULL if not
  *                      desired.
- * @returns             The prefixed IP header length in bytes on success.
- * @returns             ENOMEM if the packet is too short to contain the IP
+ * @return              The prefixed IP header length in bytes on success.
+ * @return              ENOMEM if the packet is too short to contain the IP
  *                      header.
  */
 int
-ip_client_process_packet(packet_t packet, ip_protocol_t *protocol,
+ip_client_process_packet(packet_t *packet, ip_protocol_t *protocol,
     ip_ttl_t *ttl, ip_tos_t *tos, int *dont_fragment, size_t *ipopt_length)
 {
-        ip_header_ref header;
-
-        header = (ip_header_ref) packet_get_data(packet);
+        ip_header_t *header;
+
+        header = (ip_header_t *) packet_get_data(packet);
         if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t)))
                 return ENOMEM;
@@ -238 +241 @@
  * @param[in] headerlen The length of the IP pseudo header in bytes.
  * @param[in] data_length The data length to be set.
- * @returns             EOK on success.
- * @returns             EBADMEM if the header parameter is NULL.
- * @returns             EINVAL if the headerlen parameter is not IPv4 pseudo
+ * @return              EOK on success.
+ * @return              EBADMEM if the header parameter is NULL.
+ * @return              EINVAL if the headerlen parameter is not IPv4 pseudo
  *                      header length.
  */
@@ -247 +250 @@
     size_t data_length)
 {
-        ipv4_pseudo_header_ref header_in;
+        ipv4_pseudo_header_t *header_in;
 
         if (!header)
@@ -253 +256 @@
 
         if (headerlen == sizeof(ipv4_pseudo_header_t)) {
-                header_in = (ipv4_pseudo_header_ref) header;
+                header_in = (ipv4_pseudo_header_t *) header;
                 header_in->data_length = htons(data_length);
                 return EOK;