Changes in uspace/lib/c/include/inet/addr.h [a62ceaf:30c5d13] in mainline

File:

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

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;
@@ -42 +44 @@
 typedef uint8_t addr128_t[16];
 
-typedef enum {
-        /** Any IP protocol version */
-        ip_any,
-        /** IPv4 */
-        ip_v4,
-        /** IPv6 */
-        ip_v6
-} ip_ver_t;
-
 /** Node address */
 typedef struct {
-        /** IP version */
-        ip_ver_t version;
+        uint16_t family;
         union {
                 addr32_t addr;
@@ -63 +55 @@
 /** Network address */
 typedef struct {
-        /** IP version */
-        ip_ver_t version;
+        /** Address family */
+        uint16_t family;
         
         /** Address */
@@ -76 +68 @@
 } inet_naddr_t;
 
-extern const addr32_t addr32_broadcast_all_hosts;
 extern const addr48_t addr48_broadcast;
 
@@ -82 +73 @@
 extern void addr128(const addr128_t, addr128_t);
 
-extern int addr48_compare(const addr48_t, const addr48_t);
 extern int addr128_compare(const addr128_t, const addr128_t);
-
-extern void addr48_solicited_node(const addr128_t, addr48_t);
 
 extern void host2addr128_t_be(const addr128_t, addr128_t);
@@ -99 +87 @@
     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_naddr(const inet_addr_t *, uint8_t, inet_naddr_t *);
@@ -111 +100 @@
 extern int inet_naddr_compare_mask(const inet_naddr_t *, const inet_addr_t *);
 
-extern int inet_addr_parse(const char *, inet_addr_t *, char **);
-extern int inet_naddr_parse(const char *, inet_naddr_t *, char **);
+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 ip_ver_t inet_addr_get(const inet_addr_t *, addr32_t *, addr128_t *);
-extern ip_ver_t inet_naddr_get(const inet_naddr_t *, addr32_t *, addr128_t *,
+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