Changes in uspace/srv/net/tl/udp/udp.c [014dd57b:348c589] in mainline

File:

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

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

@@ -40 +40 @@
 #include <malloc.h>
 #include <stdio.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/net.h>
@@ -61 +60 @@
 #include <ip_interface.h>
 #include <icmp_client.h>
-#include <icmp_interface.h>
+#include <icmp_remote.h>
 #include <net_interface.h>
 #include <socket_core.h>
@@ -354 +353 @@
                                     SERVICE_UDP, IPC_GET_ERROR(*icall));
                         
-                        ipc_answer_0(iid, (sysarg_t) rc);
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 default:
-                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
+                        async_answer_0(iid, (sysarg_t) ENOTSUP);
                 }
                 
@@ -393 +392 @@
         udp_globals.net_phone = net_phone;
         
-        udp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP,
-            ICMP_CONNECT_TIMEOUT);
+        udp_globals.icmp_phone = icmp_connect_module(ICMP_CONNECT_TIMEOUT);
         
         udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP,
@@ -419 +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;
@@ -436 +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;
@@ -501 +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);
@@ -541 +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 */
@@ -788 +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;
@@ -869 +880 @@
 
         /* Release the application phone */
-        ipc_hangup(app_phone);
+        async_hangup(app_phone);
 
         /* Release all local sockets */
@@ -876 +887 @@
 
         return res;
+}
+
+/** Per-connection initialization
+ *
+ */
+void tl_connection(void)
+{
 }
 
@@ -891 +909 @@
  * @see IS_NET_UDP_MESSAGE()
  */
-int tl_module_message(ipc_callid_t callid, ipc_call_t *call,
+int tl_message(ipc_callid_t callid, ipc_call_t *call,
     ipc_call_t *answer, size_t *answer_count)
 {