Changeset dd0c8a0 in mainline for uspace/lib/c/include/net/in6.h

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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/c/include/net/in6.h (modified) (2 diffs)

uspace/lib/c/include/net/in6.h

@@ -43 +43 @@
 
 /** INET6 string address maximum length. */
-#define INET6_ADDRSTRLEN        (8 * 4 + 7 + 1)
-
-/** Type definition of the INET6 address.
- * @see in6_addr
- */
-typedef struct in6_addr in6_addr_t;
-
-/** Type definition of the INET6 socket address.
- * @see sockaddr_in6
- */
-typedef struct sockaddr_in6     sockaddr_in6_t;
+#define INET6_ADDRSTRLEN  (8 * 4 + 7 + 1)
 
 /** INET6 address. */
-struct in6_addr {
+typedef struct in6_addr {
         /** 16 byte IPv6 address. */
-        unsigned char s6_addr[16];
-};
+        uint8_t s6_addr[16];
+} in6_addr_t;
 
 /** INET6 socket address.
  * @see sockaddr
  */
-struct sockaddr_in6 {
+typedef struct sockaddr_in6 {
         /** Address family. Should be AF_INET6. */
         uint16_t sin6_family;
@@ -75 +65 @@
         /** Scope identifier. */
         uint32_t sin6_scope_id;
-};
+} sockaddr_in6_t;
+
+extern const in6_addr_t in6addr_any;
 
 #endif