Changeset ca2d142 in mainline for uspace/srv/net/tl

Timestamp:

2010-02-18T10:00:30Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e326edc

Parents:

b8da2a3 (diff), 91478aa (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 from the networking branch.

Location:

uspace/srv/net/tl

Files:

• icmp/icmp.c (modified) (8 diffs)
• icmp/icmp.h (modified) (1 diff)
• tcp/tcp.c (modified) (5 diffs)
• tl_common.c (modified) (1 diff)
• tl_common.h (modified) (1 diff)
• udp/udp.c (modified) (3 diffs)

uspace/srv/net/tl/icmp/icmp.c

@@ -115 +115 @@
 #define ICMP_GET_REPLY_KEY( id, sequence )      ((( id ) << 16 ) | ( sequence & 0xFFFF ))
 
-/** Type definition of the ICMP reply timeout.
- *  @see icmp_reply_timeout
- */
-typedef struct icmp_reply_timeout       icmp_reply_timeout_t;
-
-/** Type definition of the ICMP reply timeout pointer.
- *  @see icmp_reply_timeout
- */
-typedef icmp_reply_timeout_t *  icmp_reply_timeout_ref;
-
-/** ICMP reply timeout data.
- *  Used as a timeouting fibril argument.
- *  @see icmp_timeout_for_reply()
- */
-struct icmp_reply_timeout{
-        /** Reply data key.
-         */
-        int                     reply_key;
-        /** Timeout in microseconds.
-         */
-        suseconds_t     timeout;
-};
-
 /** Processes the received ICMP packet.
  *  Is used as an entry point from the underlying IP module.
@@ -255 +232 @@
 int     icmp_process_echo_reply( packet_t packet, icmp_header_ref header, icmp_type_t type, icmp_code_t code );
 
-/** Tries to set the pending reply result as timeouted.
- *  Sleeps the timeout period of time and then tries to obtain and set the pending reply result as timeouted and signals the reply result.
- *  If the reply data are still present, the reply timeouted and the parent fibril is awaken.
- *  The global lock is not released in this case to be reused by the parent fibril.
- *  Should run in a searate fibril.
- *  @param[in] data The icmp_reply_timeout structure.
- *  @returns EOK on success.
- *  @returns EINVAL if the data parameter is NULL.
- */
-int     icmp_timeout_for_reply( void * data );
-
 /** Assigns a new identifier for the connection.
  *  Fills the echo data parameter with the assigned values.
@@ -304 +270 @@
 }
 
-int icmp_timeout_for_reply( void * data ){
-        icmp_reply_ref                  reply;
-        icmp_reply_timeout_ref  timeout = data;
-
-        if( ! timeout ){
-                return EINVAL;
-        }
-        // sleep the given timeout
-        async_usleep( timeout->timeout );
-        // lock the globals
-        fibril_rwlock_write_lock( & icmp_globals.lock );
-        // find the pending reply
-        reply = icmp_replies_find( & icmp_globals.replies, timeout->reply_key );
-        if( reply ){
-                // set the timeout result
-                reply->result = ETIMEOUT;
-                // notify the main fibril
-                fibril_condvar_signal( & reply->condvar );
-        }else{
-                // unlock only if no reply
-                fibril_rwlock_write_unlock( & icmp_globals.lock );
-        }
-        // release the timeout structure
-        free( timeout );
-        return EOK;
-}
-
 int icmp_echo( icmp_param_t id, icmp_param_t sequence, size_t size, mseconds_t timeout, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, const struct sockaddr * addr, socklen_t addrlen ){
         ERROR_DECLARE;
@@ -339 +278 @@
         uint8_t *               data;
         icmp_reply_ref                  reply;
-        icmp_reply_timeout_ref  reply_timeout;
+        int                             reply_key;
         int                             result;
         int                             index;
-        fid_t                   fibril;
 
         if( addrlen <= 0 ){
@@ -349 +287 @@
         length = ( size_t ) addrlen;
         // TODO do not ask all the time
-        ERROR_PROPAGATE( ip_packet_size_req( icmp_globals.ip_phone, -1, & icmp_globals.addr_len, & icmp_globals.prefix, & icmp_globals.content, & icmp_globals.suffix ));
-        packet = packet_get_4( icmp_globals.net_phone, size, icmp_globals.addr_len, ICMP_HEADER_SIZE + icmp_globals.prefix, icmp_globals.suffix );
+        ERROR_PROPAGATE( ip_packet_size_req( icmp_globals.ip_phone, -1, & icmp_globals.packet_dimension ));
+        packet = packet_get_4( icmp_globals.net_phone, size, icmp_globals.packet_dimension.addr_len, ICMP_HEADER_SIZE + icmp_globals.packet_dimension.prefix, icmp_globals.packet_dimension.suffix );
         if( ! packet ) return ENOMEM;
 
@@ -379 +317 @@
         header->un.echo.sequence_number = sequence;
 
-        // prepare the reply and the reply timeout structures
-        reply_timeout = malloc( sizeof( * reply_timeout ));
-        if( ! reply_timeout ){
-                return icmp_release_and_return( packet, ENOMEM );
-        }
+        // prepare the reply structure
         reply = malloc( sizeof( * reply ));
         if( ! reply ){
-                free( reply_timeout );
                 return icmp_release_and_return( packet, ENOMEM );
         }
-        // prepare the timeouting thread
-        fibril = fibril_create( icmp_timeout_for_reply, reply_timeout );
-        if( ! fibril ){
-                free( reply );
-                free( reply_timeout );
-                return icmp_release_and_return( packet, EPARTY );
-        }
-        reply_timeout->reply_key = ICMP_GET_REPLY_KEY( header->un.echo.identifier, header->un.echo.sequence_number );
-        // timeout in microseconds
-        reply_timeout->timeout = timeout * 1000;
         fibril_mutex_initialize( & reply->mutex );
         fibril_mutex_lock( & reply->mutex );
         fibril_condvar_initialize( & reply->condvar );
-        // start the timeouting fibril
-        fibril_add_ready( fibril );
-        index = icmp_replies_add( & icmp_globals.replies, reply_timeout->reply_key, reply );
+        reply_key = ICMP_GET_REPLY_KEY( header->un.echo.identifier, header->un.echo.sequence_number );
+        index = icmp_replies_add( & icmp_globals.replies, reply_key, reply );
         if( index < 0 ){
                 free( reply );
@@ -417 +339 @@
 
         // wait for a reply
-        fibril_condvar_wait( & reply->condvar, & reply->mutex );
-
-        // read the result
-        result = reply->result;
+        // timeout in microseconds
+        if( ERROR_OCCURRED( fibril_condvar_wait_timeout( & reply->condvar, & reply->mutex, timeout * 1000 ))){
+                result = ERROR_CODE;
+
+                // lock the globals again and clean up
+                fibril_rwlock_write_lock( & icmp_globals.lock );
+        }else{
+                // read the result
+                result = reply->result;
+
+                // release the reply structure
+                fibril_mutex_unlock( & reply->mutex );
+        }
 
         // destroy the reply structure
-        fibril_mutex_unlock( & reply->mutex );
         icmp_replies_exclude_index( & icmp_globals.replies, index );
         return result;
@@ -547 +477 @@
                 return icmp_globals.ip_phone;
         }
-        ERROR_PROPAGATE( ip_packet_size_req( icmp_globals.ip_phone, -1, & icmp_globals.addr_len, & icmp_globals.prefix, & icmp_globals.content, & icmp_globals.suffix ));
-        icmp_globals.prefix += ICMP_HEADER_SIZE;
-        icmp_globals.content -= ICMP_HEADER_SIZE;
+        ERROR_PROPAGATE( ip_packet_size_req( icmp_globals.ip_phone, -1, & icmp_globals.packet_dimension ));
+        icmp_globals.packet_dimension.prefix += ICMP_HEADER_SIZE;
+        icmp_globals.packet_dimension.content -= ICMP_HEADER_SIZE;
         // get configuration
         icmp_globals.error_reporting = NET_DEFAULT_ICMP_ERROR_REPORTING;

uspace/srv/net/tl/icmp/icmp.h

@@ -94 +94 @@
          */
         int                             ip_phone;
-        /** Reserved packet prefix length.
+        /** Packet dimension.
          */
-        size_t                  prefix;
-        /** Maximal packet content length.
-         */
-        size_t                  content;
-        /** Reserved packet suffix length.
-         */
-        size_t                  suffix;
-        /** Packet address length.
-         */
-        size_t                  addr_len;
+        packet_dimension_t      packet_dimension;
         /** Networking module phone.
          */

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;

uspace/srv/net/tl/tl_common.c

@@ -89 +89 @@
                 * packet_dimension = malloc( sizeof( ** packet_dimension ));
                 if( ! * packet_dimension ) return ENOMEM;
-                if( ERROR_OCCURRED( ip_packet_size_req( ip_phone, device_id, & ( ** packet_dimension ).addr_len, & ( ** packet_dimension ).prefix, & ( ** packet_dimension ).content, & ( ** packet_dimension ).suffix ))){
+                if( ERROR_OCCURRED( ip_packet_size_req( ip_phone, device_id, * packet_dimension ))){
                         free( * packet_dimension );
                         return ERROR_CODE;

uspace/srv/net/tl/tl_common.h

@@ -43 +43 @@
 #include "../include/inet.h"
 #include "../include/socket_codes.h"
-
-/** Type definition of the packet dimension.
- *  @see packet_dimension
- */
-typedef struct packet_dimension packet_dimension_t;
-
-/** Type definition of the packet dimension pointer.
- *  @see packet_dimension
- */
-typedef packet_dimension_t *    packet_dimension_ref;
-
-/** Packet dimension.
- */
-struct packet_dimension{
-        /** Reserved packet prefix length.
-         */
-        size_t                  prefix;
-        /** Maximal packet content length.
-         */
-        size_t                  content;
-        /** Reserved packet suffix length.
-         */
-        size_t                  suffix;
-        /** Maximal packet address length.
-         */
-        size_t                  addr_len;
-};
 
 /** Device packet dimensions.

uspace/srv/net/tl/udp/udp.c

@@ -205 +205 @@
         }
         // read default packet dimensions
-        ERROR_PROPAGATE( ip_packet_size_req( udp_globals.ip_phone, -1, & udp_globals.packet_dimension.addr_len, & udp_globals.packet_dimension.prefix, & udp_globals.packet_dimension.content, & udp_globals.packet_dimension.suffix ));
+        ERROR_PROPAGATE( ip_packet_size_req( udp_globals.ip_phone, -1, & udp_globals.packet_dimension ));
         ERROR_PROPAGATE( socket_ports_initialize( & udp_globals.sockets ));
         if( ERROR_OCCURRED( packet_dimensions_initialize( & udp_globals.dimensions ))){
@@ -579 +579 @@
 //      }else{
                 // do not ask all the time
-                ERROR_PROPAGATE( ip_packet_size_req( udp_globals.ip_phone, -1, & udp_globals.packet_dimension.addr_len, & udp_globals.packet_dimension.prefix, & udp_globals.packet_dimension.content, & udp_globals.packet_dimension.suffix ));
+                ERROR_PROPAGATE( ip_packet_size_req( udp_globals.ip_phone, -1, & udp_globals.packet_dimension ));
                 packet_dimension = & udp_globals.packet_dimension;
 //      }
@@ -604 +604 @@
                         return udp_release_and_return( packet, result );
                 }
-                packet = pq_add( packet, next_packet, index, 0 );
+                if( ERROR_OCCURRED( pq_add( & packet, next_packet, index, 0 ))){
+                        return udp_release_and_return( packet, ERROR_CODE );
+                }
                 total_length += ( size_t ) result;
                 if( udp_globals.checksum_computing ){