Changeset e417b96 in mainline for uspace/srv/net/il

Timestamp:

2010-03-23T22:58:44Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

5814ef7

Parents:

76ca3f7

Message:

IPC_[SG]ET_ARG macros refactored to be more explicit and safer

Location:

uspace/srv/net/il

Files:

• arp/arp_messages.h (modified) (1 diff)
• ip/ip.c (modified) (3 diffs)
• ip/ip_messages.h (modified) (1 diff)

uspace/srv/net/il/arp/arp_messages.h

@@ -75 +75 @@
  *  @param[in] call The message call structure.
  */
-#define ARP_GET_NETIF(call)             (services_t) IPC_GET_ARG2(*call)
+#define ARP_GET_NETIF(call) \
+        ({services_t service = (services_t) IPC_GET_ARG2(*call); service;})
 
 /*@}*/

uspace/srv/net/il/ip/ip.c

@@ -893 +893 @@
         struct sockaddr * addr;
         size_t addrlen;
+        size_t prefix;
+        size_t suffix;
+        size_t content;
         ip_pseudo_header_ref header;
         size_t headerlen;
@@ -924 +927 @@
                         ERROR_PROPAGATE(ip_get_route_req(0, IP_GET_PROTOCOL(call), addr, (socklen_t) addrlen,
                             &device_id, &header, &headerlen));
-                        *IPC_SET_DEVICE(answer) = device_id;
-                        *IP_SET_HEADERLEN(answer) = headerlen;
+                        IPC_SET_DEVICE(answer, device_id);
+                        IP_SET_HEADERLEN(answer, headerlen);
                         *answer_count = 2;
                         if(! ERROR_OCCURRED(data_reply(&headerlen, sizeof(headerlen)))){
@@ -933 +936 @@
                         return ERROR_CODE;
                 case NET_IL_PACKET_SPACE:
-                        ERROR_PROPAGATE(ip_packet_size_message(IPC_GET_DEVICE(call), IPC_SET_ADDR(answer), IPC_SET_PREFIX(answer), IPC_SET_CONTENT(answer), IPC_SET_SUFFIX(answer)));
-                        *answer_count = 3;
+                        ERROR_PROPAGATE(ip_packet_size_message(IPC_GET_DEVICE(call), &addrlen, &prefix, &content, &suffix));
+                        IPC_SET_ADDR(answer, addrlen);
+                        IPC_SET_PREFIX(answer, prefix);
+                        IPC_SET_CONTENT(answer, content);
+                        IPC_SET_SUFFIX(answer, suffix);
+                        *answer_count = 4;
                         return EOK;
                 case NET_IL_MTU_CHANGED:

uspace/srv/net/il/ip/ip_messages.h

@@ -72 +72 @@
  *  @param[in] call The message call structure.
  */
-#define IP_GET_ADDRESS(call)            ({in_addr_t addr; addr.s_addr = IPC_GET_ARG3(*call); addr;})
+#define IP_GET_ADDRESS(call) \
+        ({in_addr_t addr; addr.s_addr = IPC_GET_ARG3(*call); addr;})
 
 /** Returns the gateway message parameter.
  *  @param[in] call The message call structure.
  */
-#define IP_GET_GATEWAY(call)            ({in_addr_t addr; addr.s_addr = IPC_GET_ARG2(*call); addr;})
+#define IP_GET_GATEWAY(call) \
+        ({in_addr_t addr; addr.s_addr = IPC_GET_ARG2(*call); addr;})
 
 /** Sets the header length in the message answer.
  *  @param[out] answer The message answer structure.
  */
-#define IP_SET_HEADERLEN(answer)        (&IPC_GET_ARG2(*answer))
+#define IP_SET_HEADERLEN(answer, value) \
+        {ipcarg_t argument = (value); IPC_SET_ARG2(*answer, argument);}
 
 /** Returns the network mask message parameter.
  *  @param[in] call The message call structure.
  */
-#define IP_GET_NETMASK(call)            ({in_addr_t addr; addr.s_addr = IPC_GET_ARG4(*call); addr;})
+#define IP_GET_NETMASK(call) \
+        ({in_addr_t addr; addr.s_addr = IPC_GET_ARG4(*call); addr;})
 
 /** Returns the protocol message parameter.
  *  @param[in] call The message call structure.
  */
-#define IP_GET_PROTOCOL(call)           ((ip_protocol_t) IPC_GET_ARG1(*call))
+#define IP_GET_PROTOCOL(call) \
+        ({ip_protocol_t protocol = (ip_protocol_t) IPC_GET_ARG1(*call); protocol;})
 
 /*@}*/