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

Timestamp:

2011-01-09T12:18:00Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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) (3 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,