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

uspace/srv/net/tcp/tcp.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -42 +42 @@
 #include <io/log.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <task.h>
 
+#include "conn.h"
 #include "ncsim.h"
 #include "pdu.h"
 #include "rqueue.h"
-#include "sock.h"
+#include "service.h"
 #include "std.h"
 #include "tcp.h"
@@ -159 +161 @@
 {
         tcp_segment_t *dseg;
-        tcp_sockpair_t rident;
+        inet_ep2_t rident;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_received_pdu()");
@@ -178 +180 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_init()");
 
+        rc = tcp_conns_init();
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing connections");
+                return ENOMEM;
+        }
+
         tcp_rqueue_init();
         tcp_rqueue_fibril_start();
@@ -192 +201 @@
         }
 
-        rc = tcp_sock_init();
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing socket service.");
+        rc = tcp_service_init();
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing service.");
                 return ENOENT;
         }