Changeset 2f19103 in mainline for uspace/srv/net/tcp/ucall.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/ucall.c (modified) (7 diffs)

uspace/srv/net/tcp/ucall.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -50 +50 @@
 /** OPEN user call
  *
- * @param lsock         Local socket
- * @param fsock         Foreign socket
+ * @param epp           Endpoint pair
  * @param acpass        Active/passive
  * @param oflags        Open flags
@@ -65 +64 @@
  * establishment.
  */
-tcp_error_t tcp_uc_open(tcp_sock_t *lsock, tcp_sock_t *fsock, acpass_t acpass,
+tcp_error_t tcp_uc_open(inet_ep2_t *epp, acpass_t acpass,
     tcp_open_flags_t oflags, tcp_conn_t **conn)
 {
         tcp_conn_t *nconn;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open(%p, %p, %s, %s, %p)",
-            lsock, fsock, acpass == ap_active ? "active" : "passive",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open(%p, %s, %s, %p)",
+            epp, acpass == ap_active ? "active" : "passive",
             oflags == tcp_open_nonblock ? "nonblock" : "none", conn);
 
-        nconn = tcp_conn_new(lsock, fsock);
+        nconn = tcp_conn_new(epp);
         tcp_conn_add(nconn);
         tcp_conn_lock(nconn);
@@ -315 +314 @@
 
 /** Segment arrived */
-void tcp_as_segment_arrived(tcp_sockpair_t *sp, tcp_segment_t *seg)
+void tcp_as_segment_arrived(inet_ep2_t *epp, tcp_segment_t *seg)
 {
         tcp_conn_t *conn;
@@ -321 +320 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG,
             "tcp_as_segment_arrived(f:(%u), l:(%u))",
-            sp->foreign.port, sp->local.port);
-
-        conn = tcp_conn_find_ref(sp);
+            epp->remote.port, epp->local.port);
+
+        conn = tcp_conn_find_ref(epp);
         if (conn == NULL) {
                 log_msg(LOG_DEFAULT, LVL_WARN, "No connection found.");
-                tcp_unexpected_segment(sp, seg);
+                tcp_unexpected_segment(epp, seg);
                 return;
         }
@@ -334 +333 @@
         if (conn->cstate == st_closed) {
                 log_msg(LOG_DEFAULT, LVL_WARN, "Connection is closed.");
-                tcp_unexpected_segment(sp, seg);
+                tcp_unexpected_segment(epp, seg);
                 tcp_conn_unlock(conn);
                 tcp_conn_delref(conn);
@@ -340 +339 @@
         }
 
-        if (inet_addr_is_any(&conn->ident.foreign.addr))
-                conn->ident.foreign.addr = sp->foreign.addr;
-        
-        if (conn->ident.foreign.port == TCP_PORT_ANY)
-                conn->ident.foreign.port = sp->foreign.port;
-        
+        if (inet_addr_is_any(&conn->ident.remote.addr))
+                conn->ident.remote.addr = epp->remote.addr;
+
+        if (conn->ident.remote.port == TCP_PORT_ANY)
+                conn->ident.remote.port = epp->remote.port;
+
         if (inet_addr_is_any(&conn->ident.local.addr))
-                conn->ident.local.addr = sp->local.addr;
+                conn->ident.local.addr = epp->local.addr;
 
         tcp_conn_segment_arrived(conn, seg);