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

File:

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

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

@@ -476 +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);
@@ -838 +838 @@
         assert(packet);
 
-        if (!GET_TCP_HEADER_SYNCHRONIZE(header))
+        if (!header->synchronize)
                 return tcp_release_and_return(packet, EINVAL);
         
@@ -903 +903 @@
         assert(packet);
 
-        if (!GET_TCP_HEADER_SYNCHRONIZE(header))
+        if (!header->synchronize)
                 return tcp_release_and_return(packet, EINVAL);
 
@@ -1057 +1057 @@
         assert(packet);
 
-        if (!GET_TCP_HEADER_ACKNOWLEDGE(header))
+        if (!header->acknowledge)
                 return tcp_release_and_return(packet, EINVAL);
 
@@ -1126 +1126 @@
         assert(header);
 
-        if (!GET_TCP_HEADER_ACKNOWLEDGE(header))
+        if (!header->acknowledge)
                 return;
 
@@ -1833 +1833 @@
 
         /* Remember the outgoing FIN */
-        if (GET_TCP_HEADER_FINALIZE(header))
+        if (header->finalize) 
                 socket_data->fin_outgoing = socket_data->next_outgoing;
         
@@ -1952 +1952 @@
                 header->acknowledgement_number =
                     htonl(socket_data->next_incoming);
-                SET_TCP_HEADER_ACKNOWLEDGE(header, 1);
+                header->acknowledge = 1;
         }
         header->window = htons(socket_data->window);
@@ -2024 +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;
 }