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

Timestamp:

2010-02-18T10:00:30Z (15 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/tl/udp/udp.c (modified) (3 diffs)

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 ){