Changeset 2f19103 in mainline for uspace/srv/net/tcp/service.c

Timestamp:

2015-05-22T07:21:37Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

58e9dec

Parents:

bf7587b0

Message:

TCP and UDP servers can make use of inet/endpoint.h types internally.

File:

• uspace/srv/net/tcp/service.c (modified) (10 diffs)

uspace/srv/net/tcp/service.c

@@ -108 +108 @@
         tcp_clst_t *clst;
         tcp_cconn_t *cconn;
+        inet_ep2_t epp;
         int rc;
         tcp_error_t trc;
@@ -145 +146 @@
         /* Replenish sentinel connection */
 
-        trc = tcp_uc_open(&clst->elocal, NULL, ap_passive, tcp_open_nonblock,
+        inet_ep2_init(&epp);
+        epp.local = clst->elocal;
+
+        trc = tcp_uc_open(&epp, ap_passive, tcp_open_nonblock,
             &conn);
         if (trc != TCP_EOK) {
@@ -331 +335 @@
         tcp_conn_t *conn;
         tcp_cconn_t *cconn;
-        tcp_sock_t local;
-        tcp_sock_t remote;
-        inet_addr_t local_addr;
+        inet_ep2_t cepp;
         int rc;
         tcp_error_t trc;
@@ -340 +342 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_impl");
+
+        cepp = *epp;
 
         /* Fill in local address? */
@@ -345 +349 @@
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_impl: "
                     "determine local address");
-                rc = inet_get_srcaddr(&epp->remote.addr, 0, &local_addr);
+                rc = inet_get_srcaddr(&epp->remote.addr, 0, &cepp.local.addr);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_impl: "
@@ -354 +358 @@
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_impl: "
                     "local address specified");
-                local_addr = epp->local.addr;
         }
 
         /* Allocate local port? */
-        if (epp->local.port == 0) {
-                epp->local.port = 49152; /* XXX */
-        }
-
-        local.addr = local_addr;
-        local.port = epp->local.port;
-        remote.addr = epp->remote.addr;
-        remote.port = epp->remote.port;
-
-        inet_addr_format(&local_addr, &slocal);
-        inet_addr_format(&remote.addr, &sremote);
+        if (cepp.local.port == 0) {
+                cepp.local.port = 49152; /* XXX */
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_impl: "
+                    "allocated local port %" PRIu16, cepp.local.port);
+        } else {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_impl: "
+                    "local port %" PRIu16 " specified", cepp.local.port);
+        }
+
+        inet_addr_format(&cepp.local.addr, &slocal);
+        inet_addr_format(&cepp.remote.addr, &sremote);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create: local=%s remote=%s",
             slocal, sremote);
-
-        trc = tcp_uc_open(&local, &remote, ap_active, tcp_open_nonblock, &conn);
+        free(slocal);
+        free(sremote);
+
+        trc = tcp_uc_open(&cepp, ap_active, tcp_open_nonblock, &conn);
         if (trc != TCP_EOK)
                 return EIO;
@@ -386 +391 @@
         tcp_uc_set_cb(conn, &tcp_service_cb, cconn);
 
-//      assoc->cb = &udp_cassoc_cb;
-//      assoc->cb_arg = cassoc;
-
         *rconn_id = cconn->id;
         return EOK;
@@ -415 +417 @@
         tcp_conn_t *conn;
         tcp_clst_t *clst;
-        tcp_sock_t local;
+        inet_ep2_t epp;
         int rc;
         tcp_error_t trc;
@@ -421 +423 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_listener_create_impl");
 
-        local.addr = ep->addr;
-        local.port = ep->port;
-
-        trc = tcp_uc_open(&local, NULL, ap_passive, tcp_open_nonblock, &conn);
+        inet_ep2_init(&epp);
+        epp.local.addr = ep->addr;
+        epp.local.port = ep->port;
+
+        trc = tcp_uc_open(&epp, ap_passive, tcp_open_nonblock, &conn);
         if (trc != TCP_EOK)
                 return EIO;
@@ -435 +438 @@
         }
 
-        clst->elocal = local;
+        clst->elocal = epp.local;
 
         /* XXX Is there a race here (i.e. the connection is already active)? */