Changes in uspace/srv/net/tl/tcp/tcp.c [79ae36dd:28a3e74] in mainline

File:

• uspace/srv/net/tl/tcp/tcp.c (modified) (17 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. */
@@ -480 +476 @@
         old_incoming = socket_data->next_incoming;
 
-        if (GET_TCP_HEADER_FINALIZE(header)) {
+        if (header->finalize) {
                 socket_data->fin_incoming = new_sequence_number +
                     total_length - TCP_HEADER_LENGTH(header);
@@ -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,
@@ -842 +838 @@
         assert(packet);
 
-        if (!GET_TCP_HEADER_SYNCHRONIZE(header))
+        if (!header->synchronize)
                 return tcp_release_and_return(packet, EINVAL);
         
@@ -907 +903 @@
         assert(packet);
 
-        if (!GET_TCP_HEADER_SYNCHRONIZE(header))
+        if (!header->synchronize)
                 return tcp_release_and_return(packet, EINVAL);
 
@@ -1061 +1057 @@
         assert(packet);
 
-        if (!GET_TCP_HEADER_ACKNOWLEDGE(header))
+        if (!header->acknowledge)
                 return tcp_release_and_return(packet, EINVAL);
 
@@ -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,
@@ -1130 +1126 @@
         assert(header);
 
-        if (!GET_TCP_HEADER_ACKNOWLEDGE(header))
+        if (!header->acknowledge)
                 return;
 
@@ -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");
@@ -1836 +1833 @@
 
         /* Remember the outgoing FIN */
-        if (GET_TCP_HEADER_FINALIZE(header))
+        if (header->finalize) 
                 socket_data->fin_outgoing = socket_data->next_outgoing;
         
@@ -1955 +1952 @@
                 header->acknowledgement_number =
                     htonl(socket_data->next_incoming);
-                SET_TCP_HEADER_ACKNOWLEDGE(header, 1);
+                header->acknowledge = 1;
         }
         header->window = htons(socket_data->window);
@@ -2027 +2024 @@
         header->source_port = htons(socket->port);
         header->source_port = htons(socket_data->dest_port);
-        SET_TCP_HEADER_LENGTH(header,
-            TCP_COMPUTE_HEADER_LENGTH(sizeof(*header)));
-        SET_TCP_HEADER_SYNCHRONIZE(header, synchronize);
-        SET_TCP_HEADER_FINALIZE(header, finalize);
+        header->header_length = TCP_COMPUTE_HEADER_LENGTH(sizeof(*header));
+        header->synchronize = synchronize;
+        header->finalize = finalize;
 }