Changeset a2e3ee6 in mainline for uspace/srv/net/udp/sock.c

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)

File:

• uspace/srv/net/udp/sock.c (modified) (4 diffs)

uspace/srv/net/udp/sock.c

@@ -201 +201 @@
         socket = (udp_sockdata_t *) sock_core->specific_data;
         
-        inet2_addr_unpack(uint32_t_be2host(addr->sin_addr.s_addr),
+        inet_addr_unpack(uint32_t_be2host(addr->sin_addr.s_addr),
             &fsock.addr);
         fsock.port = sock_core->port;
@@ -270 +270 @@
                 }
                 
-                inet2_addr_unpack(uint32_t_be2host(addr->sin_addr.s_addr),
+                inet_addr_unpack(uint32_t_be2host(addr->sin_addr.s_addr),
                     &fsock.addr);
                 fsock.port = uint16_t_be2host(addr->sin_port);
@@ -316 +316 @@
         fibril_mutex_lock(&socket->lock);
         
-        if (inet2_addr_is_any(&socket->assoc->ident.local.addr)) {
+        if (inet_addr_is_any(&socket->assoc->ident.local.addr)) {
                 /* Determine local IP address */
-                inet2_addr_t loc_addr;
-                inet2_addr_t rem_addr;
+                inet_addr_t loc_addr;
+                inet_addr_t rem_addr;
                 
                 rem_addr = fsock_ptr ? fsock.addr :
                     socket->assoc->ident.foreign.addr;
                 
-                int rc = inet2_get_srcaddr(&rem_addr, 0, &loc_addr);
+                int rc = inet_get_srcaddr(&rem_addr, 0, &loc_addr);
                 if (rc != EOK) {
                         fibril_mutex_unlock(&socket->lock);
@@ -479 +479 @@
                 /* Fill address */
                 uint32_t rsock_addr;
-                int rc = inet2_addr_pack(&rsock->addr, &rsock_addr);
+                int rc = inet_addr_pack(&rsock->addr, &rsock_addr);
                 if (rc != EOK) {
                         fibril_mutex_unlock(&socket->recv_buffer_lock);