Changeset 977fcea in mainline for uspace/srv/net/tl/icmp/icmp.c

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f9dd44d

Parents:

0bd2879 (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:

development branch merge

File:

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

uspace/srv/net/tl/icmp/icmp.c

@@ -405 +405 @@
         measured_string_t names[] = {
                 {
-                        (char *) "ICMP_ERROR_REPORTING",
+                        (uint8_t *) "ICMP_ERROR_REPORTING",
                         20
                 },
                 {
-                        (char *) "ICMP_ECHO_REPLYING",
+                        (uint8_t *) "ICMP_ECHO_REPLYING",
                         18
                 }
@@ -415 +415 @@
         measured_string_t *configuration;
         size_t count = sizeof(names) / sizeof(measured_string_t);
-        char *data;
+        uint8_t *data;
         int rc;
 
@@ -696 +696 @@
         case NET_ICMP_DEST_UNREACH:
                 rc = packet_translate_remote(icmp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
                 return icmp_destination_unreachable_msg_local(0,
-                    ICMP_GET_CODE(call), ICMP_GET_MTU(call), packet);
+                    ICMP_GET_CODE(*call), ICMP_GET_MTU(*call), packet);
         case NET_ICMP_SOURCE_QUENCH:
                 rc = packet_translate_remote(icmp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
@@ -709 +709 @@
         case NET_ICMP_TIME_EXCEEDED:
                 rc = packet_translate_remote(icmp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return icmp_time_exceeded_msg_local(0, ICMP_GET_CODE(call),
+                return icmp_time_exceeded_msg_local(0, ICMP_GET_CODE(*call),
                     packet);
         case NET_ICMP_PARAMETERPROB:
                 rc = packet_translate_remote(icmp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return icmp_parameter_problem_msg_local(0, ICMP_GET_CODE(call),
-                    ICMP_GET_POINTER(call), packet);
+                return icmp_parameter_problem_msg_local(0, ICMP_GET_CODE(*call),
+                    ICMP_GET_POINTER(*call), packet);
         default:
                 return ENOTSUP;
@@ -787 +787 @@
         bool keep_on_going = true;
         ipc_call_t answer;
-        int answer_count;
+        size_t answer_count;
         size_t length;
         struct sockaddr *addr;
@@ -894 +894 @@
  */
 int icmp_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;
@@ -903 +903 @@
         case NET_TL_RECEIVED:
                 rc = packet_translate_remote(icmp_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return icmp_received_msg_local(IPC_GET_DEVICE(call), packet,
-                    SERVICE_ICMP, IPC_GET_ERROR(call));
+                return icmp_received_msg_local(IPC_GET_DEVICE(*call), packet,
+                    SERVICE_ICMP, IPC_GET_ERROR(*call));
         
         case NET_ICMP_INIT:
-                return icmp_process_client_messages(callid, * call);
+                return icmp_process_client_messages(callid, *call);
         
         default:
@@ -936 +936 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t answer_count;
                 
                 /* Clear the answer structure */