Changeset f4f866c in mainline for uspace/lib/net/il/ip_client.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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 mainline changes.

File:

• uspace/lib/net/il/ip_client.c (modified) (3 diffs)

uspace/lib/net/il/ip_client.c

@@ -56 +56 @@
 }
 
-int ip_client_get_pseudo_header(ip_protocol_t protocol, struct sockaddr * src, socklen_t srclen, struct sockaddr * dest, socklen_t destlen, size_t data_length, ip_pseudo_header_ref * header, size_t * headerlen){
+int ip_client_get_pseudo_header(ip_protocol_t protocol, struct sockaddr * src, socklen_t srclen, struct sockaddr * dest, socklen_t destlen, size_t data_length, void **header, size_t * headerlen){
         ipv4_pseudo_header_ref header_in;
         struct sockaddr_in * address_in;
@@ -84 +84 @@
                         header_in->protocol = protocol;
                         header_in->data_length = htons(data_length);
-                        *header = (ip_pseudo_header_ref) header_in;
+                        *header = header_in;
                         return EOK;
                 // TODO IPv6
@@ -164 +164 @@
 }
 
-int ip_client_set_pseudo_header_data_length(ip_pseudo_header_ref header, size_t headerlen, size_t data_length){
+int ip_client_set_pseudo_header_data_length(void *header, size_t headerlen, size_t data_length){
         ipv4_pseudo_header_ref header_in;