Changeset ca2d142 in mainline for uspace/srv/net/il/ip/ip.c

Timestamp:

2010-02-18T10:00:30Z (14 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.

File:

• uspace/srv/net/il/ip/ip.c (modified) (10 diffs)

uspace/srv/net/il/ip/ip.c

@@ -152 +152 @@
 int     ip_device_state_message( device_id_t device_id, device_state_t state );
 
+/** Returns the device packet dimensions for sending.
+ *  @param[in] phone The service module phone.
+ *  @param[in] message The service specific message.
+ *  @param[in] device_id The device identifier.
+ *  @param[out] addr_len The minimum reserved address length.
+ *  @param[out] prefix The minimum reserved prefix size.
+ *  @param[out] content The maximum content size.
+ *  @param[out] suffix The minimum reserved suffix size.
+ *  @returns EOK on success.
+ */
+int     ip_packet_size_message( device_id_t device_id, size_t * addr_len, size_t * prefix, size_t * content, size_t * suffix );
+
 /** Registers the transport layer protocol.
  *  The traffic of this protocol will be supplied using either the receive function or IPC message.
@@ -380 +392 @@
  *  @returns ENOMEM if the packet is too short to contain the IP header.
  *  @returns EAFNOSUPPORT if the address family is not supported.
+ *  @returns EPERM if the protocol is not allowed to send ICMP notifications. The ICMP protocol itself.
  *  @returns Other error codes as defined for the packet_set_addr().
  */
@@ -550 +563 @@
         }
         // get packet dimensions
-        ERROR_PROPAGATE( nil_packet_size_req( ip_netif->phone, ip_netif->device_id, & ip_netif->addr_len, & ip_netif->prefix, & ip_netif->content, & ip_netif->suffix ));
-        if( ip_netif->content < IP_MIN_CONTENT ){
-                printf( "Maximum transmission unit %d bytes is too small, at least %d bytes are needed\n", ip_netif->content, IP_MIN_CONTENT );
-                ip_netif->content = IP_MIN_CONTENT;
+        ERROR_PROPAGATE( nil_packet_size_req( ip_netif->phone, ip_netif->device_id, & ip_netif->packet_dimension ));
+        if( ip_netif->packet_dimension.content < IP_MIN_CONTENT ){
+                printf( "Maximum transmission unit %d bytes is too small, at least %d bytes are needed\n", ip_netif->packet_dimension.content, IP_MIN_CONTENT );
+                ip_netif->packet_dimension.content = IP_MIN_CONTENT;
         }
         index = ip_netifs_add( & ip_globals.netifs, ip_netif->device_id, ip_netif );
@@ -576 +589 @@
                 return ENOENT;
         }
-        netif->content = mtu;
+        netif->packet_dimension.content = mtu;
         printf( "ip - device %d changed mtu to %d\n\n", device_id, mtu );
         fibril_rwlock_write_unlock( & ip_globals.netifs_lock );
@@ -767 +780 @@
                 pq_release( ip_globals.net_phone, packet_get_id( packet ));
         }else{
-                packet = ip_split_packet( packet, netif->prefix, netif->content, netif->suffix, netif->addr_len, error );
+                packet = ip_split_packet( packet, netif->packet_dimension.prefix, netif->packet_dimension.content, netif->packet_dimension.suffix, netif->packet_dimension.addr_len, error );
                 if( packet ){
                         nil_send_msg( netif->phone, netif->device_id, packet, SERVICE_IP );
@@ -890 +903 @@
                         return ERROR_CODE;
                 case NET_IL_PACKET_SPACE:
-                        ERROR_PROPAGATE( ip_packet_size_req( 0, IPC_GET_DEVICE( call ), IPC_SET_ADDR( answer ), IPC_SET_PREFIX( answer ), IPC_SET_CONTENT( answer ), IPC_SET_SUFFIX( answer )));
+                        ERROR_PROPAGATE( ip_packet_size_message( IPC_GET_DEVICE( call ), IPC_SET_ADDR( answer ), IPC_SET_PREFIX( answer ), IPC_SET_CONTENT( answer ), IPC_SET_SUFFIX( answer )));
                         * answer_count = 3;
                         return EOK;
@@ -899 +912 @@
 }
 
-int ip_packet_size_req( int ip_phone, device_id_t device_id, size_t * addr_len, size_t * prefix, size_t * content, size_t * suffix ){
+int ip_packet_size_req( int ip_phone, device_id_t device_id, packet_dimension_ref packet_dimension ){
+        if( ! packet_dimension ) return EBADMEM;
+        return ip_packet_size_message( device_id, & packet_dimension->addr_len, & packet_dimension->prefix, & packet_dimension->content, & packet_dimension->suffix );
+}
+
+int ip_packet_size_message( device_id_t device_id, size_t * addr_len, size_t * prefix, size_t * content, size_t * suffix ){
         ip_netif_ref    netif;
         int                             index;
@@ -913 +931 @@
                         netif = ip_netifs_get_index( & ip_globals.netifs, index );
                         if( netif ){
-                                if( netif->addr_len > * addr_len ) * addr_len = netif->addr_len;
-                                if( netif->prefix > * prefix ) * prefix = netif->prefix;
-                                if( netif->suffix > * suffix ) * suffix = netif->suffix;
+                                if( netif->packet_dimension.addr_len > * addr_len ) * addr_len = netif->packet_dimension.addr_len;
+                                if( netif->packet_dimension.prefix > * prefix ) * prefix = netif->packet_dimension.prefix;
+                                if( netif->packet_dimension.suffix > * suffix ) * suffix = netif->packet_dimension.suffix;
                         }
                 }
@@ -926 +944 @@
                         return ENOENT;
                 }
-                * addr_len = ( netif->addr_len > IP_ADDR ) ? netif->addr_len : IP_ADDR;
-                * prefix = netif->prefix + IP_PREFIX;
-                * suffix = netif->suffix + IP_SUFFIX;
+                * addr_len = ( netif->packet_dimension.addr_len > IP_ADDR ) ? netif->packet_dimension.addr_len : IP_ADDR;
+                * prefix = netif->packet_dimension.prefix + IP_PREFIX;
+                * suffix = netif->packet_dimension.suffix + IP_SUFFIX;
         }
         fibril_rwlock_read_unlock( & ip_globals.netifs_lock );
@@ -1415 +1433 @@
         // only for the first fragment
         if( IP_FRAGMENT_OFFSET( header )) return EINVAL;
+        // not for the ICMP protocol
+        if( header->protocol == IPPROTO_ICMP ){
+                return EPERM;
+        }
         // set the destination address
         switch( header->version ){