Changeset fb4d788 in mainline for uspace/srv/net/tcp/rqueue.c

Timestamp:

2015-07-28T11:28:14Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce3 (diff), 47726b5e (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 from the mainline

File:

• uspace/srv/net/tcp/rqueue.c (modified) (7 diffs)

uspace/srv/net/tcp/rqueue.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -67 +67 @@
  * This is for testing purposes only.
  *
- * @param sp    Socket pair, oriented for transmission
+ * @param sp    Endpoint pair, oriented for transmission
  * @param seg   Segment
  */
-void tcp_rqueue_bounce_seg(tcp_sockpair_t *sp, tcp_segment_t *seg)
+void tcp_rqueue_bounce_seg(inet_ep2_t *epp, tcp_segment_t *seg)
 {
-        tcp_sockpair_t rident;
+        inet_ep2_t rident;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_bounce_seg()");
@@ -80 +80 @@
         tcp_segment_t *dseg;
 
-        if (tcp_pdu_encode(sp, seg, &pdu) != EOK) {
+        if (tcp_pdu_encode(epp, seg, &pdu) != EOK) {
                 log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped.");
                 return;
@@ -97 +97 @@
 #else
         /* Reverse the identification */
-        tcp_sockpair_flipped(sp, &rident);
+        tcp_ep2_flipped(epp, &rident);
 
         /* Insert segment back into rqueue */
@@ -106 +106 @@
 /** Insert segment into receive queue.
  *
- * @param sp    Socket pair, oriented for reception
+ * @param epp   Endpoint pair, oriented for reception
  * @param seg   Segment
  */
-void tcp_rqueue_insert_seg(tcp_sockpair_t *sp, tcp_segment_t *seg)
+void tcp_rqueue_insert_seg(inet_ep2_t *epp, tcp_segment_t *seg)
 {
         tcp_rqueue_entry_t *rqe;
@@ -122 +122 @@
         }
 
-        rqe->sp = *sp;
+        rqe->epp = *epp;
         rqe->seg = seg;
 
@@ -140 +140 @@
                 rqe = list_get_instance(link, tcp_rqueue_entry_t, link);
 
-                tcp_as_segment_arrived(&rqe->sp, rqe->seg);
+                tcp_as_segment_arrived(&rqe->epp, rqe->seg);
                 free(rqe);
         }