Changes in uspace/srv/net/tl/tcp/tcp.c [9934f7d:0743493a] in mainline

File:

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

uspace/srv/net/tl/tcp/tcp.c

@@ -38 +38 @@
 #include <assert.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <fibril_synch.h>
 #include <malloc.h>
@@ -73 +72 @@
 #include "tcp.h"
 #include "tcp_header.h"
-
-// FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
 
 /** TCP module name. */
@@ -803 +799 @@
 
         /* Notify the destination socket */
-        async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED,
+        async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
             (sysarg_t) socket->socket_id,
             ((packet_dimension->content < socket_data->data_fragment_size) ?
@@ -824 +820 @@
 
         /* Notify the destination socket */
-        async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED,
+        async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
             (sysarg_t) socket->socket_id,
             0, 0, 0,
@@ -1082 +1078 @@
                 if (rc == EOK) {
                         /* Notify the destination socket */
-                        async_obsolete_msg_5(socket->phone, NET_SOCKET_ACCEPTED,
+                        async_msg_5(socket->phone, NET_SOCKET_ACCEPTED,
                             (sysarg_t) listening_socket->socket_id,
                             socket_data->data_fragment_size, TCP_HEADER_SIZE,
@@ -1273 +1269 @@
 {
         int res;
+        bool keep_on_going = true;
         socket_cores_t local_sockets;
         int app_phone = IPC_GET_PHONE(call);
@@ -1296 +1293 @@
         fibril_rwlock_initialize(&lock);
 
-        while (true) {
+        while (keep_on_going) {
 
                 /* Answer the call */
@@ -1304 +1301 @@
                 /* Get the next call */
                 callid = async_get_call(&call);
-                
-                if (!IPC_GET_IMETHOD(call)) {
+
+                /* Process the call */
+                switch (IPC_GET_IMETHOD(call)) {
+                case IPC_M_PHONE_HUNGUP:
+                        keep_on_going = false;
                         res = EHANGUP;
                         break;
-                }
-
-                /* Process the call */
-                switch (IPC_GET_IMETHOD(call)) {
+
                 case NET_SOCKET:
                         socket_data =
@@ -1509 +1506 @@
 
         /* Release the application phone */
-        async_obsolete_hangup(app_phone);
+        async_hangup(app_phone);
 
         printf("release\n");
@@ -2442 +2439 @@
  * @param[in]     iid   Message identifier.
  * @param[in,out] icall Message parameters.
- * @param[in]     arg   Local argument.
+ *
  */
-static void tcp_receiver(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void tcp_receiver(ipc_callid_t iid, ipc_call_t *icall)
 {
         packet_t *packet;