Changeset 71b00dcc in mainline for uspace/srv/net/tl/icmp/icmp_api.c

Timestamp:

2010-03-07T22:51:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

60ab6c3

Parents:

b5cbff4 (diff), 31c80a5 (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 lp:~lukasmejdrech/helenos/network.

File:

• uspace/srv/net/tl/icmp/icmp_api.c (modified) (1 diff)

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

@@ -52 +52 @@
 #include "icmp_messages.h"
 
-int icmp_echo_msg( int icmp_phone, size_t size, mseconds_t timeout, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, const struct sockaddr * addr, socklen_t addrlen ){
-        aid_t                   message_id;
-        ipcarg_t                result;
+int icmp_echo_msg(int icmp_phone, size_t size, mseconds_t timeout, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, const struct sockaddr * addr, socklen_t addrlen){
+        aid_t message_id;
+        ipcarg_t result;
 
-        if( addrlen <= 0 ){
+        if(addrlen <= 0){
                 return EINVAL;
         }
-        message_id = async_send_5( icmp_phone, NET_ICMP_ECHO, size, timeout, ttl, tos, ( ipcarg_t ) dont_fragment, NULL );
+        message_id = async_send_5(icmp_phone, NET_ICMP_ECHO, size, timeout, ttl, tos, (ipcarg_t) dont_fragment, NULL);
         // send the address
-        async_data_write_start( icmp_phone, addr, ( size_t ) addrlen );
+        async_data_write_start(icmp_phone, addr, (size_t) addrlen);
         // timeout version may cause inconsistency - there is also an inner timer
-        // return async_wait_timeout( message_id, & result, timeout );
-        async_wait_for( message_id, & result );
-        return ( int ) result;
+        // return async_wait_timeout(message_id, &result, timeout);
+        async_wait_for(message_id, &result);
+        return (int) result;
 }