Changes in uspace/srv/net/tcp/tcp.c [2989c7e:c0f3460] in mainline

File:

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

uspace/srv/net/tcp/tcp.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2012 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 "service.h"
+#include "sock.h"
 #include "std.h"
 #include "tcp.h"
@@ -143 +141 @@
             pdu->text_size);
 
-        dgram.iplink = 0;
         dgram.src = pdu->src;
         dgram.dest = pdu->dest;
@@ -153 +150 @@
         if (rc != EOK)
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to transmit PDU.");
-
-        free(pdu_raw);
 }
 
@@ -161 +156 @@
 {
         tcp_segment_t *dseg;
-        inet_ep2_t rident;
+        tcp_sockpair_t rident;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_received_pdu()");
@@ -179 +174 @@
 
         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();
@@ -201 +189 @@
         }
 
-        rc = tcp_service_init();
+        rc = tcp_sock_init();
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing service.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing socket service.");
                 return ENOENT;
         }