Changeset 6e81d04 in mainline

Timestamp:

2010-03-15T21:06:02Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c09ae

Parents:

5d2e976 (diff), 02d9fec (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 another networking fix.

Location:

uspace/srv/net

Files:

• il/ip/ip.c (modified) (2 diffs)
• il/ip/ip_messages.h (modified) (1 diff)
• messages.h (modified) (4 diffs)

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

@@ -895 +895 @@
         ip_pseudo_header_ref header;
         size_t headerlen;
+        device_id_t device_id;
 
         *answer_count = 0;
@@ -921 +922 @@
                 case NET_IP_GET_ROUTE:
                         ERROR_PROPAGATE(data_receive((void **) &addr, &addrlen));
-                        ERROR_PROPAGATE(ip_get_route_req(0, IP_GET_PROTOCOL(call), addr, (socklen_t) addrlen, IPC_SET_DEVICE(answer), &header, &headerlen));
+                        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;
                         *answer_count = 2;

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

@@ -82 +82 @@
  *  @param[out] answer The message answer structure.
  */
-#define IP_SET_HEADERLEN(answer)        ((size_t *) &IPC_GET_ARG2(*answer))
+#define IP_SET_HEADERLEN(answer)        (&IPC_GET_ARG2(*answer))
 
 /** Returns the network mask message parameter.

uspace/srv/net/messages.h

@@ -391 +391 @@
  *  @param[out] answer The message answer structure.
  */
-#define IPC_SET_DEVICE(answer)  ((device_id_t *) &IPC_GET_ARG1(*answer))
+#define IPC_SET_DEVICE(answer)  (&IPC_GET_ARG1(*answer))
 
 /** Sets the minimum address length in the message answer.
  *  @param[out] answer The message answer structure.
  */
-#define IPC_SET_ADDR(answer)            ((size_t *) &IPC_GET_ARG1(*answer))
+#define IPC_SET_ADDR(answer)            (&IPC_GET_ARG1(*answer))
 
 /*@}*/
@@ -407 +407 @@
  *  @param[out] answer The message answer structure.
  */
-#define IPC_SET_PREFIX(answer)  ((size_t *) &IPC_GET_ARG2(*answer))
+#define IPC_SET_PREFIX(answer)  (&IPC_GET_ARG2(*answer))
 
 /*@}*/
@@ -418 +418 @@
  *  @param[out] answer The message answer structure.
  */
-#define IPC_SET_CONTENT(answer) ((size_t *) &IPC_GET_ARG3(*answer))
+#define IPC_SET_CONTENT(answer) (&IPC_GET_ARG3(*answer))
 
 /*@}*/
@@ -429 +429 @@
  *  @param[out] answer The message answer structure.
  */
-#define IPC_SET_SUFFIX(answer)  ((size_t *) &IPC_GET_ARG4(*answer))
+#define IPC_SET_SUFFIX(answer)  (&IPC_GET_ARG4(*answer))
 
 /*@}*/