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

Timestamp:

2011-05-31T22:58:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d362410

Parents:

82582e4 (diff), 4ce90544 (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 changes.

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