Changes in uspace/lib/c/include/inet/addr.h [26de91a:83781a22] in mainline

File:

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

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

@@ -39 +39 @@
 #include <net/in.h>
 #include <net/in6.h>
-#include <net/socket.h>
 
 typedef uint32_t addr32_t;
@@ -45 +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;
@@ -66 +55 @@
 /** Network address */
 typedef struct {
-        /** IP version */
-        ip_ver_t version;
+        /** Address family */
+        uint16_t family;
         
         /** Address */
@@ -79 +68 @@
 } inet_naddr_t;
 
-extern const addr32_t addr32_broadcast_all_hosts;
 extern const addr48_t addr48_broadcast;
 
@@ -102 +90 @@
     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 *);
@@ -120 +109 @@
 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 *);
 
@@ -135 +124 @@
     sockaddr_in6_t *);
 
-extern ip_ver_t ipver_from_af(int af);
-extern int inet_addr_sockaddr(const inet_addr_t *, uint16_t, sockaddr_t **,
-    socklen_t *);
-
 #endif