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

Timestamp:

2011-05-01T19:34:26Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

0e26444

Parents:

1ff896e (diff), 042fbe0 (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 mainline changes

File:

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

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

@@ -417 +417 @@
         rc = packet_dimensions_initialize(&udp_globals.dimensions);
         if (rc != EOK) {
-                socket_ports_destroy(&udp_globals.sockets);
+                socket_ports_destroy(&udp_globals.sockets, free);
                 fibril_rwlock_write_unlock(&udp_globals.lock);
                 return rc;
@@ -434 +434 @@
             &data);
         if (rc != EOK) {
-                socket_ports_destroy(&udp_globals.sockets);
+                socket_ports_destroy(&udp_globals.sockets, free);
                 fibril_rwlock_write_unlock(&udp_globals.lock);
                 return rc;
@@ -499 +499 @@
         device_id_t device_id;
         packet_dimension_t *packet_dimension;
+        size_t size;
         int rc;
+
+        /* In case of error, do not update the data fragment size. */
+        *data_fragment_size = 0;
         
         rc = tl_get_address_port(addr, addrlen, &dest_port);
@@ -539 +543 @@
                 packet_dimension = &udp_globals.packet_dimension;
 //      }
+
+        /*
+         * Update the data fragment size based on what the lower layers can
+         * handle without fragmentation, but not more than the maximum allowed
+         * for UDP.
+         */
+        size = MAX_UDP_FRAGMENT_SIZE;
+        if (packet_dimension->content < size)
+            size = packet_dimension->content;
+        *data_fragment_size = size;
 
         /* Read the first packet fragment */
@@ -740 +754 @@
         int socket_id;
         size_t addrlen;
-        size_t size = 0;
+        size_t size;
         ipc_call_t answer;
         size_t answer_count;
@@ -786 +800 @@
                                 break;
                         
+                        size = MAX_UDP_FRAGMENT_SIZE;
                         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);
+                                if (packet_dimension->content < size)
+                                        size = packet_dimension->content;
                         }
-
-//                      SOCKET_SET_DATA_FRAGMENT_SIZE(answer,
-//                          MAX_UDP_FRAGMENT_SIZE);
+                        SOCKET_SET_DATA_FRAGMENT_SIZE(answer, size);
                         SOCKET_SET_HEADER_SIZE(answer, UDP_HEADER_SIZE);
                         answer_count = 3;