Changeset 98abd40 in mainline for uspace/srv/net/tcp/tcp_type.h

Timestamp:

2013-07-06T21:57:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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/srv/net/tcp/tcp_type.h (modified) (4 diffs)

uspace/srv/net/tcp/tcp_type.h

@@ -43 +43 @@
 #include <socket_core.h>
 #include <sys/types.h>
+#include <inet/addr.h>
 
 struct tcp_conn;
@@ -112 +113 @@
 
 typedef struct {
-        uint32_t ipv4;
-} netaddr_t;
-
-typedef struct {
-        netaddr_t addr;
+        inet_addr_t addr;
         uint16_t port;
 } tcp_sock_t;
-
-enum netaddr {
-        TCP_IPV4_ANY = 0
-};
 
 enum tcp_port {
@@ -313 +306 @@
 typedef struct {
         /** Source address */
-        netaddr_t src_addr;
+        inet_addr_t src;
         /** Destination address */
-        netaddr_t dest_addr;
-
+        inet_addr_t dest;
         /** Encoded header */
         void *header;
@@ -344 +336 @@
         tcp_conn_t *conn;
         /** Local address */
-        netaddr_t laddr;
+        inet_addr_t laddr;
         /** Backlog size */
         int backlog;