Changeset 98abd40 in mainline for uspace/lib/c/include/inet/addr.h

Timestamp:

2013-07-06T21:57:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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/inet/addr.h (modified) (1 diff)

uspace/lib/c/include/inet/addr.h

@@ -37 +37 @@
 
 #include <stdint.h>
+#include <net/in.h>
+#include <net/in6.h>
+
+typedef uint32_t addr32_t;
+typedef uint8_t addr48_t[6];
+typedef uint8_t addr128_t[16];
 
 /** Node address */
 typedef struct {
-        uint32_t ipv4;
+        uint16_t family;
+        union {
+                addr32_t addr;
+                addr128_t addr6;
+        };
 } inet_addr_t;
 
 /** Network address */
 typedef struct {
+        /** Address family */
+        uint16_t family;
+        
         /** Address */
-        uint32_t ipv4;
-        /** Number of valid bits in @c ipv4 */
-        int bits;
+        union {
+                addr32_t addr;
+                addr128_t addr6;
+        };
+        
+        /** Number of valid bits */
+        uint8_t prefix;
 } inet_naddr_t;
 
+extern const addr48_t addr48_broadcast;
+
+extern void addr48(const addr48_t, addr48_t);
+extern void addr128(const addr128_t, addr128_t);
+
+extern void host2addr128_t_be(const addr128_t, addr128_t);
+extern void addr128_t_be2host(const addr128_t, addr128_t);
+
+extern void inet_addr(inet_addr_t *, uint8_t, uint8_t, uint8_t, uint8_t);
+extern void inet_naddr(inet_naddr_t *, uint8_t, uint8_t, uint8_t, uint8_t,
+    uint8_t);
+
+extern void inet_addr6(inet_addr_t *, uint16_t, uint16_t, uint16_t, uint16_t,
+    uint16_t, uint16_t, uint16_t, uint16_t);
+extern void inet_naddr6(inet_naddr_t *, uint16_t, uint16_t, uint16_t, uint16_t,
+    uint16_t, uint16_t, uint16_t, uint16_t, uint8_t);
+
+extern int inet_addr_family(const char *, uint16_t *);
+extern void inet_naddr_addr(const inet_naddr_t *, inet_addr_t *);
+
+extern void inet_addr_any(inet_addr_t *);
+extern void inet_naddr_any(inet_naddr_t *);
+
+extern int inet_addr_compare(const inet_addr_t *, const inet_addr_t *);
+extern int inet_addr_is_any(const inet_addr_t *);
+
+extern int inet_naddr_compare_mask(const inet_naddr_t *, const inet_addr_t *);
+
+extern int inet_addr_parse(const char *, inet_addr_t *);
 extern int inet_naddr_parse(const char *, inet_naddr_t *);
-extern int inet_addr_parse(const char *, inet_addr_t *);
-extern int inet_naddr_format(inet_naddr_t *, char **);
-extern int inet_addr_format(inet_addr_t *, char **);
+
+extern int inet_addr_format(const inet_addr_t *, char **);
+extern int inet_naddr_format(const inet_naddr_t *, char **);
+
+extern uint16_t inet_addr_get(const inet_addr_t *, addr32_t *, addr128_t *);
+extern uint16_t inet_naddr_get(const inet_naddr_t *, addr32_t *, addr128_t *,
+    uint8_t *);
+
+extern void inet_addr_set(addr32_t, inet_addr_t *);
+extern void inet_naddr_set(addr32_t, uint8_t, inet_naddr_t *);
+extern void inet_sockaddr_in_addr(const sockaddr_in_t *, inet_addr_t *);
+
+extern void inet_addr_set6(addr128_t, inet_addr_t *);
+extern void inet_naddr_set6(addr128_t, uint8_t, inet_naddr_t *);
+extern void inet_sockaddr_in6_addr(const sockaddr_in6_t *, inet_addr_t *);
+
+extern uint16_t inet_addr_sockaddr_in(const inet_addr_t *, sockaddr_in_t *,
+    sockaddr_in6_t *);
 
 #endif