Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 59157eb35e6e9c10dc18e144c444d8d35d9453ef) +++ uspace/lib/c/Makefile (revision bc385789c90bd429765abebdb70ac2057bcf31db) @@ -98,4 +98,6 @@ generic/io/printf_core.c \ generic/io/console.c \ + generic/iplink.c \ + generic/iplink_srv.c \ generic/malloc.c \ generic/sysinfo.c \ Index: uspace/lib/c/generic/iplink.c =================================================================== --- uspace/lib/c/generic/iplink.c (revision bc385789c90bd429765abebdb70ac2057bcf31db) +++ uspace/lib/c/generic/iplink.c (revision bc385789c90bd429765abebdb70ac2057bcf31db) @@ -0,0 +1,166 @@ +/* + * Copyright (c) 2012 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** + * @file + * @brief IP link client stub + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +static void iplink_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg); + +int iplink_open(async_sess_t *sess, iplink_ev_ops_t *ev_ops, + iplink_t **riplink) +{ + iplink_t *iplink = NULL; + int rc; + + iplink = calloc(1, sizeof(iplink_t)); + if (iplink == NULL) + return ENOMEM; + + iplink->sess = sess; + iplink->ev_ops = ev_ops; + + async_exch_t *exch = async_exchange_begin(sess); + + rc = async_connect_to_me(exch, 0, 0, 0, iplink_cb_conn, iplink); + async_exchange_end(exch); + + if (rc != EOK) + goto error; + + *riplink = iplink; + return EOK; + +error: + if (iplink != NULL) + free(iplink); + + return rc; +} + +void iplink_close(iplink_t *iplink) +{ + /* XXX Synchronize with iplink_cb_conn */ + free(iplink); +} + +int iplink_send(iplink_t *iplink, iplink_sdu_t *sdu) +{ + async_exch_t *exch = async_exchange_begin(iplink->sess); + + ipc_call_t answer; + aid_t req = async_send_2(exch, IPLINK_SEND, sdu->src.ipv4, + sdu->dest.ipv4, &answer); + int rc = async_data_write_start(exch, sdu->data, sdu->size); + async_exchange_end(exch); + + if (rc != EOK) { + async_wait_for(req, NULL); + return rc; + } + + sysarg_t retval; + async_wait_for(req, &retval); + if (retval != EOK) + return retval; + + return EOK; +} + +int iplink_get_mtu(iplink_t *iplink, size_t *rmtu) +{ + sysarg_t mtu; + async_exch_t *exch = async_exchange_begin(iplink->sess); + + int rc = async_req_0_1(exch, IPLINK_GET_MTU, &mtu); + async_exchange_end(exch); + + if (rc != EOK) + return rc; + + *rmtu = mtu; + return EOK; +} + +static void iplink_ev_recv(iplink_t *iplink, ipc_callid_t callid, + ipc_call_t *call) +{ + int rc; + iplink_sdu_t sdu; + + sdu.src.ipv4 = IPC_GET_ARG1(*call); + sdu.dest.ipv4 = IPC_GET_ARG2(*call); + + rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size); + if (rc != EOK) { + async_answer_0(callid, rc); + return; + } + + rc = iplink->ev_ops->recv(iplink, &sdu); + async_answer_0(callid, rc); +} + +static void iplink_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) +{ + iplink_t *iplink = (iplink_t *)arg; + + while (true) { + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + + if (!IPC_GET_IMETHOD(call)) { + /* TODO: Handle hangup */ + return; + } + + switch (IPC_GET_IMETHOD(call)) { + case IPLINK_EV_RECV: + iplink_ev_recv(iplink, callid, &call); + break; + default: + async_answer_0(callid, ENOTSUP); + } + } +} + +/** @} + */ Index: uspace/lib/c/generic/iplink_srv.c =================================================================== --- uspace/lib/c/generic/iplink_srv.c (revision bc385789c90bd429765abebdb70ac2057bcf31db) +++ uspace/lib/c/generic/iplink_srv.c (revision bc385789c90bd429765abebdb70ac2057bcf31db) @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2012 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** + * @file + * @brief IP link server stub + */ +#include +#include +#include +#include + +#include + +static void iplink_get_mtu_srv(iplink_conn_t *conn, ipc_callid_t callid, + ipc_call_t *call) +{ + int rc; + size_t mtu; + + rc = conn->srv->ops->get_mtu(conn, &mtu); + async_answer_1(callid, rc, mtu); +} + +static void iplink_send_srv(iplink_conn_t *conn, ipc_callid_t callid, + ipc_call_t *call) +{ + iplink_srv_sdu_t sdu; + int rc; + + sdu.src.ipv4 = IPC_GET_ARG1(*call); + sdu.dest.ipv4 = IPC_GET_ARG2(*call); + + rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size); + if (rc != EOK) { + async_answer_0(callid, rc); + return; + } + + rc = conn->srv->ops->send(conn, &sdu); + free(sdu.data); + async_answer_0(callid, rc); +} + +int iplink_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) +{ + iplink_srv_t *srv = (iplink_srv_t *)arg; + iplink_conn_t conn; + int rc; + + /* Accept the connection */ + async_answer_0(iid, EOK); + + async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE); + if (sess == NULL) + return ENOMEM; + + conn.srv = srv; + conn.client_sess = sess; + + rc = srv->ops->open(&conn); + if (rc != EOK) + return rc; + + while (true) { + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + sysarg_t method = IPC_GET_IMETHOD(call); + + if (!method) { + /* The other side has hung up */ + async_answer_0(callid, EOK); + break; + } + + switch (method) { + case IPLINK_GET_MTU: + iplink_get_mtu_srv(&conn, callid, &call); + break; + case IPLINK_SEND: + iplink_send_srv(&conn, callid, &call); + break; + default: + async_answer_0(callid, EINVAL); + } + } + + return srv->ops->close(&conn); +} + +int iplink_ev_recv(iplink_conn_t *conn, iplink_srv_sdu_t *sdu) +{ + async_exch_t *exch = async_exchange_begin(conn->client_sess); + + ipc_call_t answer; + aid_t req = async_send_2(exch, IPLINK_EV_RECV, sdu->src.ipv4, + sdu->dest.ipv4, &answer); + int rc = async_data_write_start(exch, sdu->data, sdu->size); + async_exchange_end(exch); + + if (rc != EOK) { + async_wait_for(req, NULL); + return rc; + } + + sysarg_t retval; + async_wait_for(req, &retval); + if (retval != EOK) + return retval; + + return EOK; +} + +/** @} + */ Index: uspace/lib/c/include/inet/iplink.h =================================================================== --- uspace/lib/c/include/inet/iplink.h (revision bc385789c90bd429765abebdb70ac2057bcf31db) +++ uspace/lib/c/include/inet/iplink.h (revision bc385789c90bd429765abebdb70ac2057bcf31db) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2012 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_INET_IPLINK_H_ +#define LIBC_INET_IPLINK_H_ + +#include +#include + +struct iplink_ev_ops; + +typedef struct { + async_sess_t *sess; + struct iplink_ev_ops *ev_ops; +} iplink_t; + +typedef struct { + uint32_t ipv4; +} iplink_addr_t; + +/** IP link Service Data Unit */ +typedef struct { + /** Source address */ + iplink_addr_t src; + /** Destination address */ + iplink_addr_t dest; + /** Serialized IP packet */ + void *data; + /** Size of @c data in bytes */ + size_t size; +} iplink_sdu_t; + +typedef struct iplink_ev_ops { + int (*recv)(iplink_t *, iplink_sdu_t *); +} iplink_ev_ops_t; + +extern int iplink_open(async_sess_t *, iplink_ev_ops_t *, iplink_t **); +extern void iplink_close(iplink_t *); +extern int iplink_send(iplink_t *, iplink_sdu_t *); +extern int iplink_get_mtu(iplink_t *, size_t *); + +#endif + +/** @} + */ Index: uspace/lib/c/include/inet/iplink_srv.h =================================================================== --- uspace/lib/c/include/inet/iplink_srv.h (revision bc385789c90bd429765abebdb70ac2057bcf31db) +++ uspace/lib/c/include/inet/iplink_srv.h (revision bc385789c90bd429765abebdb70ac2057bcf31db) @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2012 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_INET_IPLINK_SRV_H_ +#define LIBC_INET_IPLINK_SRV_H_ + +#include +#include + +struct iplink_ops; + +typedef struct { + struct iplink_ops *ops; + void *arg; +} iplink_srv_t; + +typedef struct { + iplink_srv_t *srv; + async_sess_t *client_sess; +} iplink_conn_t; + +typedef struct { + uint32_t ipv4; +} iplink_srv_addr_t; + +/** IP link Service Data Unit */ +typedef struct { + /** Source address */ + iplink_srv_addr_t src; + /** Destination address */ + iplink_srv_addr_t dest; + /** Serialized IP packet */ + void *data; + /** Size of @c data in bytes */ + size_t size; +} iplink_srv_sdu_t; + +typedef struct iplink_ops { + int (*open)(iplink_conn_t *); + int (*close)(iplink_conn_t *); + int (*send)(iplink_conn_t *, iplink_srv_sdu_t *); + int (*get_mtu)(iplink_conn_t *, size_t *); +} iplink_ops_t; + +extern int iplink_conn(ipc_callid_t, ipc_call_t *, void *); +extern int iplink_ev_recv(iplink_conn_t *, iplink_srv_sdu_t *); + +#endif + +/** @} + */ Index: uspace/lib/c/include/ipc/iplink.h =================================================================== --- uspace/lib/c/include/ipc/iplink.h (revision bc385789c90bd429765abebdb70ac2057bcf31db) +++ uspace/lib/c/include/ipc/iplink.h (revision bc385789c90bd429765abebdb70ac2057bcf31db) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2012 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcipc + * @{ + */ +/** @file + */ + +#ifndef LIBC_IPC_IPLINK_H_ +#define LIBC_IPC_IPLINK_H_ + +#include + +typedef enum { + IPLINK_GET_MTU = IPC_FIRST_USER_METHOD, + IPLINK_SEND +} iplink_request_t; + +typedef enum { + IPLINK_EV_RECV = IPC_FIRST_USER_METHOD +} iplink_event_t; + +#endif + +/** + * @} + */