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

Timestamp:

2013-10-05T11:53:43Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cbfc8b7

Parents:

408424e (diff), 3e896e1 (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) (6 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;
@@ -44 +45 @@
 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 {
-        uint16_t family;
+        /** IP version */
+        ip_ver_t version;
         union {
                 addr32_t addr;
@@ -55 +66 @@
 /** Network address */
 typedef struct {
-        /** Address family */
-        uint16_t family;
+        /** IP version */
+        ip_ver_t version;
         
         /** Address */
@@ -91 +102 @@
     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 *);
@@ -110 +120 @@
 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 *,
+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 *);
 
@@ -125 +135 @@
     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