Changeset a2e3ee6 in mainline for uspace/srv/net/udp

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/srv/net/udp

Files:

• assoc.c (modified) (2 diffs)
• pdu.c (modified) (1 diff)
• sock.c (modified) (4 diffs)
• udp_inet.c (modified) (2 diffs)
• udp_type.h (modified) (3 diffs)

uspace/srv/net/udp/assoc.c

@@ -252 +252 @@
                 sp.foreign = *fsock;
 
-        if ((inet2_addr_is_any(&sp.foreign.addr)) ||
+        if ((inet_addr_is_any(&sp.foreign.addr)) ||
             (sp.foreign.port == UDP_PORT_ANY))
                 return EINVAL;
@@ -372 +372 @@
 static bool udp_socket_match(udp_sock_t *sock, udp_sock_t *patt)
 {
-        if ((!inet2_addr_is_any(&patt->addr)) &&
-            (!inet2_addr_compare(&patt->addr, &sock->addr)))
+        if ((!inet_addr_is_any(&patt->addr)) &&
+            (!inet_addr_compare(&patt->addr, &sock->addr)))
                 return false;
         

uspace/srv/net/udp/pdu.c

@@ -89 +89 @@
         
         uint32_t src;
-        inet2_addr_pack(&pdu->src, &src);
+        inet_addr_pack(&pdu->src, &src);
         
         uint32_t dest;
-        inet2_addr_pack(&pdu->dest, &dest);
+        inet_addr_pack(&pdu->dest, &dest);
         
         phdr->src_addr = host2uint32_t_be(src);

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);

uspace/srv/net/udp/udp_inet.c

@@ -66 +66 @@
         pdu->data = dgram->data;
         pdu->data_size = dgram->size;
-        
-        inet_inet2(&dgram->src, &pdu->src);
-        inet_inet2(&dgram->dest, &pdu->dest);
+
+        pdu->src = dgram->src;
+        pdu->dest = dgram->dest;
 
         udp_received_pdu(pdu);
@@ -84 +84 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_transmit_pdu()");
 
-        inet2_inet(&pdu->src, &dgram.src);
-        inet2_inet(&pdu->dest, &dgram.dest);
+        dgram.src = pdu->src;
+        dgram.dest = pdu->dest;
         dgram.tos = 0;
         dgram.data = pdu->data;

uspace/srv/net/udp/udp_type.h

@@ -40 +40 @@
 #include <socket_core.h>
 #include <sys/types.h>
-#include <inet/addr2.h>
+#include <inet/addr.h>
 
 #define UDP_FRAGMENT_SIZE 4096
@@ -66 +66 @@
 
 typedef struct {
-        inet2_addr_t addr;
+        inet_addr_t addr;
         uint16_t port;
 } udp_sock_t;
@@ -86 +86 @@
 typedef struct {
         /** Source address */
-        inet2_addr_t src;
+        inet_addr_t src;
         /** Destination address */
-        inet2_addr_t dest;
+        inet_addr_t dest;
         
         /** Encoded PDU data including header */