Changeset 7bf12387 in mainline for uspace/lib/net

Timestamp:

2011-05-28T19:44:42Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0743493a

Parents:

40ffda8

git-author:

Jeff Rous <jeffrous@…> (2011-05-28 19:44:42)

git-committer:

Jakub Jermar <jakub@…> (2011-05-28 19:44:42)

Message:

ip: Rename the defines so they don't conflict with similar TCP changes

Location:

uspace/lib/net

Files:

• il/ip_client.c (modified) (3 diffs)
• include/ip_header.h (modified) (5 diffs)

uspace/lib/net/il/ip_client.c

@@ -181 +181 @@
         /* Set the header */
         header = (ip_header_t *) data;
-        SET_HEADER_LENGTH(header, (IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t)
-        + ipopt_length)));
+        SET_IP_HEADER_LENGTH(header,
+            (IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) + ipopt_length)));
         header->ttl = (ttl ? ttl : IPDEFTTL);
         header->tos = tos;
@@ -188 +188 @@
 
         if (dont_fragment)
-                SET_HEADER_FLAGS(header, IPFLAG_DONT_FRAGMENT);
+                SET_IP_HEADER_FLAGS(header, IPFLAG_DONT_FRAGMENT);
 
         return EOK;
@@ -227 +227 @@
                 *tos = header->tos;
         if (dont_fragment)
-                *dont_fragment = GET_HEADER_FLAGS(header) & IPFLAG_DONT_FRAGMENT;
+                *dont_fragment = GET_IP_HEADER_FLAGS(header) & IPFLAG_DONT_FRAGMENT;
         if (ipopt_length) {
                 *ipopt_length = IP_HEADER_LENGTH(header) - sizeof(ip_header_t);

uspace/lib/net/include/ip_header.h

@@ -64 +64 @@
  */
 #define IP_FRAGMENT_OFFSET(header) \
-        (((GET_HEADER_FRAGMENT_OFFSET_HIGH(header) << 8) + \
+        (((GET_IP_HEADER_FRAGMENT_OFFSET_HIGH(header) << 8) + \
             (header)->fragment_offset_low) * 8U)
 
@@ -83 +83 @@
  */
 #define IP_HEADER_LENGTH(header) \
-        (GET_HEADER_LENGTH(header) * 4U)
+        (GET_IP_HEADER_LENGTH(header) * 4U)
 
 /** Returns the actual IP packet total length.
@@ -145 +145 @@
         uint8_t vhl; /* version, header_length */
 
-#define GET_HEADER_VERSION(header) \
+#define GET_IP_HEADER_VERSION(header) \
         (((header)->vhl & 0xf0) >> 4)
-#define SET_HEADER_VERSION(header, version) \
+#define SET_IP_HEADER_VERSION(header, version) \
         ((header)->vhl = \
          ((version & 0x0f) << 4) | ((header)->vhl & 0x0f))
 
-#define GET_HEADER_LENGTH(header) \
+#define GET_IP_HEADER_LENGTH(header) \
         ((header)->vhl & 0x0f)
-#define SET_HEADER_LENGTH(header, length) \
+#define SET_IP_HEADER_LENGTH(header, length) \
         ((header)->vhl = \
          (length & 0x0f) | ((header)->vhl & 0xf0))
@@ -163 +163 @@
         uint8_t ffoh; /* flags, fragment_offset_high */
 
-#define GET_HEADER_FLAGS(header) \
+#define GET_IP_HEADER_FLAGS(header) \
         (((header)->ffoh & 0xe0) >> 5)
-#define SET_HEADER_FLAGS(header, flags) \
+#define SET_IP_HEADER_FLAGS(header, flags) \
         ((header)->ffoh = \
          ((flags & 0x07) << 5) | ((header)->ffoh & 0x1f))
 
-#define GET_HEADER_FRAGMENT_OFFSET_HIGH(header) \
+#define GET_IP_HEADER_FRAGMENT_OFFSET_HIGH(header) \
         ((header)->ffoh & 0x1f)
-#define SET_HEADER_FRAGMENT_OFFSET_HIGH(header, fragment_offset_high) \
+#define SET_IP_HEADER_FRAGMENT_OFFSET_HIGH(header, fragment_offset_high) \
         ((header)->ffoh = \
          (fragment_offset_high & 0x1f) | ((header)->ffoh & 0xe0))
@@ -195 +195 @@
         uint8_t of; /* overflow, flags */
 
-#define GET_OPTION_OVERFLOW(option) \
+#define GET_IP_OPTION_OVERFLOW(option) \
         (((option)->of & 0xf0) >> 4)
-#define SET_OPTION_OVERFLOW(option, overflow) \
+#define SET_IP_OPTION_OVERFLOW(option, overflow) \
         ((option)->of = \
          ((overflow & 0x0f) << 4) | ((option)->of & 0x0f))
 
-#define GET_OPTION_FLAGS(option) \
+#define GET_IP_OPTION_FLAGS(option) \
         ((option)->of & 0x0f)
-#define SET_OPTION_FLAGS(option, flags) \
+#define SET_IP_OPTION_FLAGS(option, flags) \
         ((option)->of = \
          (flags & 0x0f) | ((option)->of & 0xf0))