Changeset 02a09ed in mainline for uspace/lib/c/include/inet/addr.h

Timestamp:

2013-06-28T20:20:03Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1d24ad3

Parents:

edf0d27

Message:

add basic infrastructure for IPv6 (inactive)
make inet_addr_t a universal address type

File:

• uspace/lib/c/include/inet/addr.h (modified) (4 diffs)

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

@@ -38 +38 @@
 #include <stdint.h>
 #include <net/in.h>
+#include <net/in6.h>
 
-#define INET_ADDR_SIZE  16
+typedef uint32_t addr32_t;
+typedef uint8_t addr48_t[6];
+typedef uint8_t addr128_t[16];
 
 /** Node address */
 typedef struct {
         uint16_t family;
-        uint8_t addr[INET_ADDR_SIZE];
+        union {
+                addr32_t addr;
+                addr128_t addr6;
+        };
 } inet_addr_t;
 
@@ -53 +59 @@
         
         /** Address */
-        uint8_t addr[INET_ADDR_SIZE];
+        union {
+                addr32_t addr;
+                addr128_t addr6;
+        };
         
         /** Number of valid bits */
@@ -59 +68 @@
 } inet_naddr_t;
 
-extern int inet_addr_family(const char *, uint16_t *);
+extern const addr48_t addr48_broadcast;
 
-extern int inet_addr_parse(const char *, inet_addr_t *);
-extern int inet_naddr_parse(const char *, inet_naddr_t *);
+extern void addr48(const addr48_t, addr48_t);
+extern void addr128(const addr128_t, addr128_t);
 
-extern int inet_addr_format(inet_addr_t *, char **);
-extern int inet_naddr_format(inet_naddr_t *, char **);
-
-extern int inet_addr_pack(inet_addr_t *, uint32_t *);
-extern int inet_naddr_pack(inet_naddr_t *, uint32_t *, uint8_t *);
-
-extern void inet_addr_unpack(uint32_t, inet_addr_t *);
-extern void inet_naddr_unpack(uint32_t, uint8_t, inet_naddr_t *);
-
-extern int inet_addr_sockaddr_in(inet_addr_t *, sockaddr_in_t *);
-extern void inet_naddr_addr(inet_naddr_t *, inet_addr_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);
@@ -80 +80 @@
     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(inet_addr_t *, inet_addr_t *);
-extern int inet_addr_is_any(inet_addr_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_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