Changeset ede63e4 in mainline for uspace/srv/net/tl/udp/udp.c

Timestamp:

2010-01-04T23:25:48Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

eac9722

Parents:

1a0fb3f8

Message:

• socket identifier generation moved to libsocket, + data fragment size fix and enhancement, + [ICMP|TCP|UDP]_HEADER_SIZE definition, + int_map_update() function to alter item key

File:

• uspace/srv/net/tl/udp/udp.c (modified) (20 diffs)

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

@@ -97 +97 @@
  *  Is used as an entry point from the underlying IP module.
  *  Locks the global lock and calls udp_process_packet() function.
- *  @param device_id The device identifier. Ignored parameter.
+ *  @param[in] device_id The receiving device identifier.
  *  @param[in,out] packet The received packet queue.
  *  @param receiver The target service. Ignored parameter.
@@ -109 +109 @@
  *  Notifies the destination socket application.
  *  Releases the packet on error or sends an ICMP error notification..
+ *  @param[in] device_id The receiving device identifier.
  *  @param[in,out] packet The received packet queue.
  *  @param[in] error The packet error reporting service. Prefixes the received packet.
@@ -120 +121 @@
  *  @returns Other error codes as defined for the ip_client_process_packet() function.
  */
-int udp_process_packet( packet_t packet, services_t error );
+int udp_process_packet( device_id_t device_id, packet_t packet, services_t error );
 
 /** Releases the packet and returns the result.
@@ -151 +152 @@
  *  @param[in] addrlen The address length.
  *  @param[in] fragments The number of data fragments.
- *  @param[in] data_fragment_size The data fragment size in bytes.
+ *  @param[out] data_fragment_size The data fragment size in bytes.
  *  @param[in] flags Various send flags.
  *  @returns EOK on success.
@@ -163 +164 @@
  *  @returns Other error codes as defined for the ip_send_msg() function.
  */
-int udp_sendto_message( socket_cores_ref local_sockets, int socket_id, const struct sockaddr * addr, socklen_t addrlen, int fragments, size_t data_fragment_size, int flags );
+int udp_sendto_message( socket_cores_ref local_sockets, int socket_id, const struct sockaddr * addr, socklen_t addrlen, int fragments, size_t * data_fragment_size, int flags );
 
 /** Receives data to the socket.
@@ -235 +236 @@
 
         fibril_rwlock_write_lock( & udp_globals.lock );
-        result = udp_process_packet( packet, error );
+        result = udp_process_packet( device_id, packet, error );
         if( result != EOK ){
                 fibril_rwlock_write_unlock( & udp_globals.lock );
@@ -243 +244 @@
 }
 
-int udp_process_packet( packet_t packet, services_t error ){
+int udp_process_packet( device_id_t device_id, packet_t packet, services_t error ){
         ERROR_DECLARE;
 
@@ -261 +262 @@
         struct sockaddr *               src;
         struct sockaddr *               dest;
+        packet_dimension_ref    packet_dimension;
 
         if( error ){
@@ -292 +294 @@
                 return udp_release_and_return( packet, EINVAL );
         }
-        if( length < sizeof( udp_header_t ) + offset ){
+        if( length < UDP_HEADER_SIZE + offset ){
                 return udp_release_and_return( packet, NO_DATA );
         }
@@ -380 +382 @@
 
         // queue the received packet
-        if( ERROR_OCCURRED( dyn_fifo_push( & socket->received, packet_get_id( packet ), SOCKET_MAX_RECEIVED_SIZE ))){
+        if( ERROR_OCCURRED( dyn_fifo_push( & socket->received, packet_get_id( packet ), SOCKET_MAX_RECEIVED_SIZE ))
+        || ERROR_OCCURRED( tl_get_ip_packet_dimension( udp_globals.ip_phone, & udp_globals.dimensions, device_id, & packet_dimension ))){
                 return udp_release_and_return( packet, ERROR_CODE );
         }
@@ -386 +389 @@
         // notify the destination socket
         fibril_rwlock_write_unlock( & udp_globals.lock );
+        async_msg_5( socket->phone, NET_SOCKET_RECEIVED, ( ipcarg_t ) socket->socket_id, packet_dimension->content, 0, 0, ( ipcarg_t ) fragments );
+/*      fibril_rwlock_write_unlock( & udp_globals.lock );
         async_msg_5( socket->phone, NET_SOCKET_RECEIVED, ( ipcarg_t ) socket->socket_id, 0, 0, 0, ( ipcarg_t ) fragments );
-        return EOK;
+*/      return EOK;
 }
 
@@ -418 +423 @@
         ipc_call_t                              answer;
         int                                             answer_count;
+        packet_dimension_ref    packet_dimension;
 
         /*
@@ -444 +450 @@
                         case NET_SOCKET:
                                 fibril_rwlock_write_lock( & lock );
+                                * SOCKET_SET_SOCKET_ID( answer ) = SOCKET_GET_SOCKET_ID( call );
                                 res = socket_create( & local_sockets, app_phone, NULL, SOCKET_SET_SOCKET_ID( answer ));
                                 fibril_rwlock_write_unlock( & lock );
-                                // TODO max fragment size
-                                * SOCKET_SET_DATA_FRAGMENT_SIZE( answer ) = MAX_UDP_FRAGMENT_SIZE;
-                                * SOCKET_SET_HEADER_SIZE( answer ) = sizeof( udp_header_t );
-                                answer_count = 3;
+                                if( res == EOK ){
+                                        if( tl_get_ip_packet_dimension( udp_globals.ip_phone, & udp_globals.dimensions, DEVICE_INVALID_ID, & packet_dimension ) == EOK ){
+                                                * SOCKET_SET_DATA_FRAGMENT_SIZE( answer ) = packet_dimension->content;
+                                        }
+//                                      * SOCKET_SET_DATA_FRAGMENT_SIZE( answer ) = MAX_UDP_FRAGMENT_SIZE;
+                                        * SOCKET_SET_HEADER_SIZE( answer ) = UDP_HEADER_SIZE;
+                                        answer_count = 3;
+                                }
                                 break;
                         case NET_SOCKET_BIND:
@@ -467 +478 @@
                                         fibril_rwlock_read_lock( & lock );
                                         fibril_rwlock_write_lock( & udp_globals.lock );
-                                        res = udp_sendto_message( & local_sockets, SOCKET_GET_SOCKET_ID( call ), addr, addrlen, SOCKET_GET_DATA_FRAGMENTS( call ), SOCKET_GET_DATA_FRAGMENT_SIZE( call ), SOCKET_GET_FLAGS( call ));
+                                        res = udp_sendto_message( & local_sockets, SOCKET_GET_SOCKET_ID( call ), addr, addrlen, SOCKET_GET_DATA_FRAGMENTS( call ), SOCKET_SET_DATA_FRAGMENT_SIZE( answer ), SOCKET_GET_FLAGS( call ));
                                         if( res != EOK ){
                                                 fibril_rwlock_write_unlock( & udp_globals.lock );
+                                        }else{
+                                                answer_count = 2;
                                         }
                                         fibril_rwlock_read_unlock( & lock );
@@ -484 +497 @@
                                         * SOCKET_SET_READ_DATA_LENGTH( answer ) = res;
                                         * SOCKET_SET_ADDRESS_LENGTH( answer ) = addrlen;
-                                        answer_count = 2;
+                                        answer_count = 3;
                                         res = EOK;
                                 }
@@ -513 +526 @@
 }
 
-int udp_sendto_message( socket_cores_ref local_sockets, int socket_id, const struct sockaddr * addr, socklen_t addrlen, int fragments, size_t data_fragment_size, int flags ){
+int udp_sendto_message( socket_cores_ref local_sockets, int socket_id, const struct sockaddr * addr, socklen_t addrlen, int fragments, size_t * data_fragment_size, int flags ){
         ERROR_DECLARE;
 
@@ -571 +584 @@
 
         // read the first packet fragment
-        result = tl_socket_read_packet_data( udp_globals.net_phone, & packet, sizeof( udp_header_t ), packet_dimension, addr, addrlen );
+        result = tl_socket_read_packet_data( udp_globals.net_phone, & packet, UDP_HEADER_SIZE, packet_dimension, addr, addrlen );
         if( result < 0 ) return result;
         total_length = ( size_t ) result;
@@ -606 +619 @@
 //                      return udp_release_and_return( packet, ERROR_CODE );
 //              }
-                if( ERROR_OCCURRED( ip_client_set_pseudo_header_data_length( ip_header, headerlen, total_length + sizeof( udp_header_t )))){
+                if( ERROR_OCCURRED( ip_client_set_pseudo_header_data_length( ip_header, headerlen, total_length + UDP_HEADER_SIZE))){
                         free( ip_header );
                         return udp_release_and_return( packet, ERROR_CODE );
@@ -615 +628 @@
                 free( ip_header );
         }else{
-                device_id = -1;
+                device_id = DEVICE_INVALID_ID;
         }
         // prepare the first packet fragment
@@ -665 +678 @@
 
         // trim the header
-        ERROR_PROPAGATE( packet_trim( packet, sizeof( udp_header_t ), 0 ));
+        ERROR_PROPAGATE( packet_trim( packet, UDP_HEADER_SIZE, 0 ));
 
         // reply the packets