Changeset fb4d788 in mainline for uspace/srv/net/tcp/ncsim.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/ncsim.c (modified) (6 diffs)

uspace/srv/net/tcp/ncsim.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -42 +42 @@
 #include <async.h>
 #include <errno.h>
+#include <inet/endpoint.h>
 #include <io/log.h>
 #include <stdlib.h>
@@ -65 +66 @@
 /** Bounce segment through simulator into receive queue.
  *
- * @param sp    Socket pair, oriented for transmission
+ * @param epp   Endpoint pair, oriented for transmission
  * @param seg   Segment
  */
-void tcp_ncsim_bounce_seg(tcp_sockpair_t *sp, tcp_segment_t *seg)
+void tcp_ncsim_bounce_seg(inet_ep2_t *epp, tcp_segment_t *seg)
 {
         tcp_squeue_entry_t *sqe;
@@ -75 +76 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_ncsim_bounce_seg()");
-        tcp_rqueue_bounce_seg(sp, seg);
+        tcp_rqueue_bounce_seg(epp, seg);
         return;
 
@@ -92 +93 @@
 
         sqe->delay = random() % (1000 * 1000);
-        sqe->sp = *sp;
+        sqe->epp = *epp;
         sqe->seg = seg;
 
@@ -147 +148 @@
 
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "NCSim - End Sleep");
-                tcp_rqueue_bounce_seg(&sqe->sp, sqe->seg);
+                tcp_rqueue_bounce_seg(&sqe->epp, sqe->seg);
                 free(sqe);
         }