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

Timestamp:

2010-02-17T21:15:03Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

e6b7b198

Parents:

bfd7aac

Message:

• change in the pq_add interface

File:

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

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

@@ -613 +613 @@
                 next_packet = pq_detach( packet );
                 length = packet_get_data_length( packet );
-                tmp_packet = pq_add( socket_data->incoming, packet, new_sequence_number, length );
-                if( ! tmp_packet ){
+                if( ERROR_OCCURRED( pq_add( & socket_data->incoming, packet, new_sequence_number, length ))){
                         // remove the corrupted packets
                         pq_release( tcp_globals.net_phone, packet_get_id( packet ));
                         pq_release( tcp_globals.net_phone, packet_get_id( next_packet ));
                 }else{
-                        socket_data->incoming = tmp_packet;
                         while( next_packet ){
                                 new_sequence_number += length;
@@ -939 +937 @@
         packet_t        next;
         packet_t        acknowledged = NULL;
-        packet_t        first;
         uint32_t        old;
 
@@ -981 +978 @@
                                         }
                                         // add to acknowledged or release
-                                        first = pq_add( acknowledged, packet, 0, 0 );
-                                        if( first ){
-                                                acknowledged = first;
-                                        }else{
+                                        if( pq_add( & acknowledged, packet, 0, 0 ) != EOK ){
                                                 pq_release( tcp_globals.net_phone, packet_get_id( packet ));
                                         }
@@ -1508 +1502 @@
 int     tcp_queue_packet( socket_core_ref socket, tcp_socket_data_ref socket_data, packet_t packet, size_t data_length ){
         ERROR_DECLARE;
-        packet_t                first;
 
         assert( socket );
@@ -1516 +1509 @@
         ERROR_PROPAGATE( tcp_queue_prepare_packet( socket, socket_data, packet, data_length ));
 
-        first = pq_add( socket_data->outgoing, packet, socket_data->next_outgoing, data_length );
-        if( ! first ){
-                return tcp_release_and_return( packet, EINVAL );
-        }
-        socket_data->outgoing = first;
+        if( ERROR_OCCURRED( pq_add( & socket_data->outgoing, packet, socket_data->next_outgoing, data_length ))){
+                return tcp_release_and_return( packet, ERROR_CODE );
+        }
         socket_data->next_outgoing += data_length;
         return EOK;