Changeset fab2746 in mainline for uspace/srv/net/tcp

Timestamp:

2015-04-08T21:25:30Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99ea91b2

Parents:

ba0eac5

Message:

New transport layer API. Only UDP implemented.

Location:

uspace/srv/net/tcp

Files:

• Makefile (modified) (2 diffs)
• sock.c (deleted)
• tcp.c (modified) (3 diffs)
• tcp_type.h (modified) (3 diffs)

uspace/srv/net/tcp/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBNET_PREFIX)/libnet.a
-EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
 BINARY = tcp
 
@@ -40 +38 @@
         segment.c \
         seq_no.c \
-        sock.c \
         tcp.c \
         test.c \

uspace/srv/net/tcp/tcp.c

@@ -42 +42 @@
 #include <io/log.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <task.h>
 
@@ -47 +48 @@
 #include "pdu.h"
 #include "rqueue.h"
-#include "sock.h"
 #include "std.h"
 #include "tcp.h"
@@ -192 +192 @@
         }
 
-        rc = tcp_sock_init();
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing socket service.");
-                return ENOENT;
-        }
+//      rc = tcp_sock_init();
+//      if (rc != EOK) {
+//              log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing socket service.");
+//              return ENOENT;
+//      }
 
         return EOK;

uspace/srv/net/tcp/tcp_type.h

@@ -41 +41 @@
 #include <fibril.h>
 #include <fibril_synch.h>
-#include <socket_core.h>
 #include <sys/types.h>
 #include <inet/addr.h>
@@ -321 +320 @@
 typedef struct {
         async_sess_t *sess;
-        socket_cores_t sockets;
+//      socket_cores_t sockets;
 } tcp_client_t;
 
@@ -330 +329 @@
         fibril_mutex_t lock;
         /** Socket core */
-        socket_core_t *sock_core;
+//      socket_core_t *sock_core;
         /** Client */
         tcp_client_t *client;