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

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>
-#include <net/socket.h>
-
-typedef uint32_t addr32_t;
-typedef uint8_t addr48_t[6];
-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;
-        union {
-                addr32_t addr;
-                addr128_t addr6;
-        };
+        uint32_t ipv4;
 } inet_addr_t;
 
 /** Network address */
 typedef struct {
-        /** IP version */
-        ip_ver_t version;
-        
         /** Address */
-        union {
-                addr32_t addr;
-                addr128_t addr6;
-        };
-        
-        /** Number of valid bits */
-        uint8_t prefix;
+        uint32_t ipv4;
+        /** Number of valid bits in @c ipv4 */
+        int bits;
 } inet_naddr_t;
 
-extern const addr32_t addr32_broadcast_all_hosts;
-extern const addr48_t addr48_broadcast;
-
-extern void addr48(const addr48_t, addr48_t);
-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);
-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 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 *);
-
-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(const inet_naddr_t *, const inet_addr_t *);
-extern int inet_naddr_compare_mask(const inet_naddr_t *, const 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_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 *,
-    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 *);
-
-extern ip_ver_t ipver_from_af(int af);
-extern int inet_addr_sockaddr(const inet_addr_t *, uint16_t, sockaddr_t **,
-    socklen_t *);
+extern int inet_naddr_format(inet_naddr_t *, char **);
+extern int inet_addr_format(inet_addr_t *, char **);
 
 #endif