Changeset 41811af in mainline for uspace/srv/net/tl/tcp/tcp.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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 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>
@@ -72 +73 @@
 #include "tcp.h"
 #include "tcp_header.h"
+
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
 
 /** TCP module name. */
@@ -476 +480 @@
         old_incoming = socket_data->next_incoming;
 
-        if (header->finalize) {
+        if (GET_TCP_HEADER_FINALIZE(header)) {
                 socket_data->fin_incoming = new_sequence_number +
                     total_length - TCP_HEADER_LENGTH(header);
@@ -799 +803 @@
 
         /* Notify the destination socket */
-        async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
+        async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED,
             (sysarg_t) socket->socket_id,
             ((packet_dimension->content < socket_data->data_fragment_size) ?
@@ -820 +824 @@
 
         /* Notify the destination socket */
-        async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
+        async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED,
             (sysarg_t) socket->socket_id,
             0, 0, 0,
@@ -838 +842 @@
         assert(packet);
 
-        if (!header->synchronize)
+        if (!GET_TCP_HEADER_SYNCHRONIZE(header))
                 return tcp_release_and_return(packet, EINVAL);
         
@@ -903 +907 @@
         assert(packet);
 
-        if (!header->synchronize)
+        if (!GET_TCP_HEADER_SYNCHRONIZE(header))
                 return tcp_release_and_return(packet, EINVAL);
 
@@ -1057 +1061 @@
         assert(packet);
 
-        if (!header->acknowledge)
+        if (!GET_TCP_HEADER_ACKNOWLEDGE(header))
                 return tcp_release_and_return(packet, EINVAL);
 
@@ -1078 +1082 @@
                 if (rc == EOK) {
                         /* Notify the destination socket */
-                        async_msg_5(socket->phone, NET_SOCKET_ACCEPTED,
+                        async_obsolete_msg_5(socket->phone, NET_SOCKET_ACCEPTED,
                             (sysarg_t) listening_socket->socket_id,
                             socket_data->data_fragment_size, TCP_HEADER_SIZE,
@@ -1126 +1130 @@
         assert(header);
 
-        if (!header->acknowledge)
+        if (!GET_TCP_HEADER_ACKNOWLEDGE(header))
                 return;
 
@@ -1269 +1273 @@
 {
         int res;
-        bool keep_on_going = true;
         socket_cores_t local_sockets;
         int app_phone = IPC_GET_PHONE(call);
@@ -1293 +1296 @@
         fibril_rwlock_initialize(&lock);
 
-        while (keep_on_going) {
+        while (true) {
 
                 /* Answer the call */
@@ -1301 +1304 @@
                 /* Get the next call */
                 callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call)) {
+                        res = EHANGUP;
+                        break;
+                }
 
                 /* Process the call */
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        keep_on_going = false;
-                        res = EHANGUP;
-                        break;
-
                 case NET_SOCKET:
                         socket_data =
@@ -1506 +1509 @@
 
         /* Release the application phone */
-        async_hangup(app_phone);
+        async_obsolete_hangup(app_phone);
 
         printf("release\n");
@@ -1833 +1836 @@
 
         /* Remember the outgoing FIN */
-        if (header->finalize) 
+        if (GET_TCP_HEADER_FINALIZE(header))
                 socket_data->fin_outgoing = socket_data->next_outgoing;
         
@@ -1952 +1955 @@
                 header->acknowledgement_number =
                     htonl(socket_data->next_incoming);
-                header->acknowledge = 1;
+                SET_TCP_HEADER_ACKNOWLEDGE(header, 1);
         }
         header->window = htons(socket_data->window);
@@ -2024 +2027 @@
         header->source_port = htons(socket->port);
         header->source_port = htons(socket_data->dest_port);
-        header->header_length = TCP_COMPUTE_HEADER_LENGTH(sizeof(*header));
-        header->synchronize = synchronize;
-        header->finalize = finalize;
+        SET_TCP_HEADER_LENGTH(header,
+            TCP_COMPUTE_HEADER_LENGTH(sizeof(*header)));
+        SET_TCP_HEADER_SYNCHRONIZE(header, synchronize);
+        SET_TCP_HEADER_FINALIZE(header, finalize);
 }