Changeset 417a2ba1 in mainline for uspace/lib/c

Timestamp:

2013-09-29T22:28:53Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d7f2cd6

Parents:

5a324d99

Message:

iplink_ev_recv() should use ip_ver_t instead of AF.

Location:

uspace/lib/c

Files:

• generic/iplink.c (modified) (2 diffs)
• generic/iplink_srv.c (modified) (2 diffs)
• include/inet/iplink.h (modified) (2 diffs)
• include/inet/iplink_srv.h (modified) (2 diffs)

uspace/lib/c/generic/iplink.c

@@ -218 +218 @@
         iplink_recv_sdu_t sdu;
         
-        uint16_t af = IPC_GET_ARG1(*icall);
+        ip_ver_t ver = IPC_GET_ARG1(*icall);
         
         int rc = async_data_write_accept(&sdu.data, false, 0, 0, 0,
@@ -227 +227 @@
         }
         
-        rc = iplink->ev_ops->recv(iplink, &sdu, af);
+        rc = iplink->ev_ops->recv(iplink, &sdu, ver);
         free(sdu.data);
         async_answer_0(iid, rc);

uspace/lib/c/generic/iplink_srv.c

@@ -272 +272 @@
 }
 
-int iplink_ev_recv(iplink_srv_t *srv, iplink_recv_sdu_t *sdu, uint16_t af)
+/* XXX Version should be part of @a sdu */
+int iplink_ev_recv(iplink_srv_t *srv, iplink_recv_sdu_t *sdu, ip_ver_t ver)
 {
         if (srv->client_sess == NULL)
@@ -280 +281 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_1(exch, IPLINK_EV_RECV, (sysarg_t) af,
+        aid_t req = async_send_1(exch, IPLINK_EV_RECV, (sysarg_t)ver,
             &answer);
         

uspace/lib/c/include/inet/iplink.h

@@ -37 +37 @@
 
 #include <async.h>
-#include <sys/types.h>
 #include <inet/addr.h>
 
@@ -78 +77 @@
 
 typedef struct iplink_ev_ops {
-        int (*recv)(iplink_t *, iplink_recv_sdu_t *, uint16_t);
+        int (*recv)(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
 } iplink_ev_ops_t;
 

uspace/lib/c/include/inet/iplink_srv.h

@@ -39 +39 @@
 #include <fibril_synch.h>
 #include <stdbool.h>
-#include <sys/types.h>
 #include <inet/addr.h>
 #include <inet/iplink.h>
@@ -67 +66 @@
 
 extern int iplink_conn(ipc_callid_t, ipc_call_t *, void *);
-extern int iplink_ev_recv(iplink_srv_t *, iplink_recv_sdu_t *, uint16_t);
+extern int iplink_ev_recv(iplink_srv_t *, iplink_recv_sdu_t *, ip_ver_t);
 
 #endif