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

Timestamp:

2011-01-14T10:08:47Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

f40a1e2

Parents:

44bb20b (diff), 6610565b (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 /usb/development

File:

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

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

@@ -104 +104 @@
         measured_string_t names[] = {
                 {
-                        (char *) "UDP_CHECKSUM_COMPUTING",
+                        (uint8_t *) "UDP_CHECKSUM_COMPUTING",
                         22
                 },
                 {
-                        (char *) "UDP_AUTOBINDING",
+                        (uint8_t *) "UDP_AUTOBINDING",
                         15
                 }
@@ -114 +114 @@
         measured_string_t *configuration;
         size_t count = sizeof(names) / sizeof(measured_string_t);
-        char *data;
+        uint8_t *data;
         int rc;
 
@@ -283 +283 @@
         /* Find the destination socket */
         socket = socket_port_find(&udp_globals.sockets,
-        ntohs(header->destination_port), SOCKET_MAP_KEY_LISTENING, 0);
+            ntohs(header->destination_port), (uint8_t *) SOCKET_MAP_KEY_LISTENING, 0);
         if (!socket) {
                 if (tl_prepare_icmp_packet(udp_globals.net_phone,
@@ -707 +707 @@
         bool keep_on_going = true;
         socket_cores_t local_sockets;
-        int app_phone = IPC_GET_PHONE(&call);
+        int app_phone = IPC_GET_PHONE(call);
         struct sockaddr *addr;
         int socket_id;
@@ -713 +713 @@
         size_t size = 0;
         ipc_call_t answer;
-        int answer_count;
+        size_t answer_count;
         packet_dimension_t *packet_dimension;
 
@@ -861 +861 @@
  */
 int udp_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *answer_count)
 {
         packet_t *packet;
@@ -871 +871 @@
         case NET_TL_RECEIVED:
                 rc = packet_translate_remote(udp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return udp_received_msg(IPC_GET_DEVICE(call), packet,
-                    SERVICE_UDP, IPC_GET_ERROR(call));
+                return udp_received_msg(IPC_GET_DEVICE(*call), packet,
+                    SERVICE_UDP, IPC_GET_ERROR(*call));
         case IPC_M_CONNECT_TO_ME:
-                return udp_process_client_messages(callid, * call);
+                return udp_process_client_messages(callid, *call);
         }
 
@@ -898 +898 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t answer_count;
                 
                 /* Clear the answer structure */