Changeset 24ab58b3 in mainline for uspace/lib/net/il/ip_remote.c

Timestamp:

2010-04-06T11:41:48Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

14f1db0

Parents:

4dd8529

Message:

more compact network startup messages (usually one line instead of multiple lines)
pass module name as an argument to nil_message() and friends
deeper cstyle changes (replace forward prototypes with proper extern declarations and static functions, change doxygen comments, stick more closely to the 80-column rule, no argument names in header files, spacing, comments, etc.)

File:

• uspace/lib/net/il/ip_remote.c (modified) (2 diffs)

uspace/lib/net/il/ip_remote.c

@@ -28 +28 @@
 
 /** @addtogroup ip
- *  @{
+ * @{
  */
 
 /** @file
- *  IP interface implementation for standalone remote modules.
- *  @see ip_interface.h
- *  @see il_interface.h
+ *
+ * IP interface implementation for standalone remote modules.
+ *
+ * @see ip_interface.h
+ * @see il_interface.h
+ *
  */
 
@@ -48 +51 @@
 #include <ip_messages.h>
 
-int ip_add_route_req(int ip_phone, device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway){
-        return (int) async_req_4_0(ip_phone, NET_IP_ADD_ROUTE, (ipcarg_t) device_id, (ipcarg_t) gateway.s_addr, (ipcarg_t) address.s_addr, (ipcarg_t) netmask.s_addr);
+int ip_add_route_req(int ip_phone, device_id_t device_id, in_addr_t address,
+    in_addr_t netmask, in_addr_t gateway)
+{
+        return (int) async_req_4_0(ip_phone, NET_IP_ADD_ROUTE,
+            (ipcarg_t) device_id, (ipcarg_t) gateway.s_addr,
+            (ipcarg_t) address.s_addr, (ipcarg_t) netmask.s_addr);
 }
 
-int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver, tl_received_msg_t tl_received_msg){
-        return (int) bind_service(service, (ipcarg_t) protocol, me, service, receiver);
+int ip_bind_service(services_t service, int protocol, services_t me,
+    async_client_conn_t receiver, tl_received_msg_t tl_received_msg)
+{
+        return (int) bind_service(service, (ipcarg_t) protocol, me, service,
+            receiver);
 }
 
-int ip_connect_module(services_t service){
+int ip_connect_module(services_t service)
+{
         return connect_to_service(SERVICE_IP);
 }
 
-int ip_device_req(int ip_phone, device_id_t device_id, services_t service){
+int ip_device_req(int ip_phone, device_id_t device_id, services_t service)
+{
         return generic_device_req(ip_phone, NET_IL_DEVICE, device_id, 0, service);
 }
 
-int ip_get_route_req(int ip_phone, ip_protocol_t protocol, const struct sockaddr * destination, socklen_t addrlen, device_id_t * device_id, ip_pseudo_header_ref * header, size_t * headerlen){
-        aid_t message_id;
-        ipcarg_t result;
+int ip_get_route_req(int ip_phone, ip_protocol_t protocol,
+    const struct sockaddr *destination, socklen_t addrlen,
+    device_id_t *device_id, ip_pseudo_header_ref *header, size_t *headerlen)
+{
+        if ((!destination) || (addrlen == 0))
+                return EINVAL;
+        
+        if ((!device_id) || (header) || (headerlen))
+                return EBADMEM;
+        
+        *header = NULL;
+        
         ipc_call_t answer;
-
-        if(!(destination && (addrlen > 0))){
-                return EINVAL;
-        }
-        if(!(device_id && header && headerlen)){
-                return EBADMEM;
-        }
-
-        *header = NULL;
-        message_id = async_send_1(ip_phone, NET_IP_GET_ROUTE, (ipcarg_t) protocol, &answer);
-        if((async_data_write_start(ip_phone, destination, addrlen) == EOK)
-                && (async_data_read_start(ip_phone, headerlen, sizeof(*headerlen)) == EOK)
-                && (*headerlen > 0)){
+        aid_t message_id = async_send_1(ip_phone, NET_IP_GET_ROUTE,
+            (ipcarg_t) protocol, &answer);
+        
+        if ((async_data_write_start(ip_phone, destination, addrlen) == EOK)
+            && (async_data_read_start(ip_phone, headerlen, sizeof(*headerlen)) == EOK)
+            && (*headerlen > 0)) {
                 *header = (ip_pseudo_header_ref) malloc(*headerlen);
-                if(*header){
-                        if(async_data_read_start(ip_phone, * header, * headerlen) != EOK){
+                if (*header) {
+                        if (async_data_read_start(ip_phone, *header, *headerlen) != EOK)
                                 free(*header);
-                        }
                 }
         }
+        
+        ipcarg_t result;
         async_wait_for(message_id, &result);
-
-        if((result != EOK) && (*header)){
+        
+        if ((result != EOK) && (*header))
                 free(*header);
-        }else{
+        else
                 *device_id = IPC_GET_DEVICE(&answer);
-        }
+        
         return (int) result;
 }
 
-int ip_packet_size_req(int ip_phone, device_id_t device_id, packet_dimension_ref packet_dimension){
-        return generic_packet_size_req(ip_phone, NET_IL_PACKET_SPACE, device_id, packet_dimension);
+int ip_packet_size_req(int ip_phone, device_id_t device_id,
+    packet_dimension_ref packet_dimension)
+{
+        return generic_packet_size_req(ip_phone, NET_IL_PACKET_SPACE, device_id,
+            packet_dimension);
 }
 
-int ip_received_error_msg(int ip_phone, device_id_t device_id, packet_t packet, services_t target, services_t error){
-        return generic_received_msg(ip_phone, NET_IP_RECEIVED_ERROR, device_id, packet_get_id(packet), target, error);
+int ip_received_error_msg(int ip_phone, device_id_t device_id,
+    packet_t packet, services_t target, services_t error)
+{
+        return generic_received_msg(ip_phone, NET_IP_RECEIVED_ERROR, device_id,
+            packet_get_id(packet), target, error);
 }
 
-int ip_send_msg(int ip_phone, device_id_t device_id, packet_t packet, services_t sender, services_t error){
-        return generic_send_msg(ip_phone, NET_IL_SEND, device_id, packet_get_id(packet), sender, error);
+int ip_send_msg(int ip_phone, device_id_t device_id, packet_t packet,
+    services_t sender, services_t error)
+{
+        return generic_send_msg(ip_phone, NET_IL_SEND, device_id,
+            packet_get_id(packet), sender, error);
 }
 
-int ip_set_gateway_req(int ip_phone, device_id_t device_id, in_addr_t gateway){
-        return (int) async_req_2_0(ip_phone, NET_IP_SET_GATEWAY, (ipcarg_t) device_id, (ipcarg_t) gateway.s_addr);
+int ip_set_gateway_req(int ip_phone, device_id_t device_id, in_addr_t gateway)
+{
+        return (int) async_req_2_0(ip_phone, NET_IP_SET_GATEWAY,
+            (ipcarg_t) device_id, (ipcarg_t) gateway.s_addr);
 }