Changeset a2e3ee6 in mainline for uspace/lib/c/generic/net

Timestamp:

2013-06-20T16:45:58Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

08bb73b

Parents:

19a4f73

Message:

use new network address infrastructure (towards IPv6 support)

Location:

uspace/lib/c/generic/net

Files:

• inet.c (modified) (1 diff)
• socket_client.c (modified) (4 diffs)
• socket_parse.c (modified) (1 diff)

uspace/lib/c/generic/net/inet.c

@@ -39 +39 @@
 #include <net/in6.h>
 #include <net/inet.h>
-
+#include <inet/addr.h>
 #include <errno.h>
 #include <mem.h>

uspace/lib/c/generic/net/socket_client.c

@@ -87 +87 @@
         /** Parent module service. */
         services_t service;
+        /** Socket family */
+        int family;
 
         /**
@@ -395 +397 @@
         switch (domain) {
         case PF_INET:
+        case PF_INET6:
                 switch (type) {
                 case SOCK_STREAM:
@@ -433 +436 @@
                 break;
 
-        case PF_INET6:
         default:
                 return EPFNOSUPPORT;
@@ -447 +449 @@
 
         memset(socket, 0, sizeof(*socket));
+        socket->family = domain;
         fibril_rwlock_write_lock(&socket_globals.lock);
 

uspace/lib/c/generic/net/socket_parse.c

@@ -79 +79 @@
 int socket_parse_protocol_family(const char *name, int *pf)
 {
+        if (str_lcmp(name, "PF_INET6", 8) == 0) {
+                *pf = PF_INET6;
+                return EOK;
+        }
+
         if (str_lcmp(name, "PF_INET", 7) == 0) {
                 *pf = PF_INET;
-                return EOK;
-        }
-        
-        if (str_lcmp(name, "PF_INET6", 8) == 0) {
-                *pf = PF_INET6;
                 return EOK;
         }