Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision c8916d15d0b9a3ebcb74f63bfddee2a2188663df) +++ uspace/lib/c/Makefile (revision c76e9267a192002d0dc6f41f5e2984b3599ac46c) @@ -87,4 +87,5 @@ generic/task.c \ generic/futex.c \ + generic/inet.c \ generic/io/asprintf.c \ generic/io/io.c \ Index: uspace/lib/c/generic/inet.c =================================================================== --- uspace/lib/c/generic/inet.c (revision c76e9267a192002d0dc6f41f5e2984b3599ac46c) +++ uspace/lib/c/generic/inet.c (revision c76e9267a192002d0dc6f41f5e2984b3599ac46c) @@ -0,0 +1,139 @@ +/* + * 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. + */ + +#include +#include +#include +#include +#include +#include +#include + +static void inet_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg); + +static async_sess_t *inet_sess = NULL; +static inet_ev_ops_t *inet_ev_ops = NULL; +static uint8_t inet_protocol = 0; + +static int inet_callback_create(void) +{ + async_exch_t *exch = async_exchange_begin(inet_sess); + + ipc_call_t answer; + aid_t req = async_send_0(exch, INET_CALLBACK_CREATE, &answer); + int rc = async_connect_to_me(exch, 0, 0, 0, inet_cb_conn, NULL); + async_exchange_end(exch); + + if (rc != EOK) + return rc; + + sysarg_t retval; + async_wait_for(req, &retval); + if (retval != EOK) + return retval; + + return EOK; +} + +static int inet_set_proto(uint8_t protocol) +{ + int rc; + + async_exch_t *exch = async_exchange_begin(inet_sess); + rc = async_req_1_0(exch, INET_SET_PROTO, protocol); + async_exchange_end(exch); + + return rc; +} + +int inet_init(uint8_t protocol, inet_ev_ops_t *ev_ops) +{ + service_id_t inet_svc; + + assert(inet_sess == NULL); + assert(inet_ev_ops == NULL); + assert(inet_protocol == 0); + + inet_svc = loc_service_get_id(SERVICE_NAME_INET, &inet_svc, + IPC_FLAG_BLOCKING); + inet_sess = loc_service_connect(EXCHANGE_SERIALIZE, inet_svc, + IPC_FLAG_BLOCKING); + if (inet_sess == NULL) + return ENOENT; + + if (inet_set_proto(protocol) != EOK) { + async_hangup(inet_sess); + inet_sess = NULL; + return EIO; + } + + if (inet_callback_create() != EOK) { + async_hangup(inet_sess); + inet_sess = NULL; + return EIO; + } + + inet_protocol = protocol; + inet_ev_ops = ev_ops; + + return EOK; +} + +int inet_send(inet_dgram_t *dgram, uint8_t ttl, inet_df_t df) +{ + return ENOTSUP; +} + +int inet_get_srcaddr(inet_addr_t *remote, uint8_t tos, inet_addr_t *local) +{ + return ENOTSUP; +} + +static void inet_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *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 INET_EV_RECV: + async_answer_0(callid, EOK); + break; + default: + async_answer_0(callid, ENOTSUP); + } + } +} + +/** @} + */ Index: uspace/lib/c/include/inet/inet.h =================================================================== --- uspace/lib/c/include/inet/inet.h (revision c76e9267a192002d0dc6f41f5e2984b3599ac46c) +++ uspace/lib/c/include/inet/inet.h (revision c76e9267a192002d0dc6f41f5e2984b3599ac46c) @@ -0,0 +1,69 @@ +/* + * 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_INET_H_ +#define LIBC_INET_INET_H_ + +#include + +#define INET_TTL_MAX 255 + +typedef struct { + uint32_t ipv4; +} inet_addr_t; + +typedef struct { + inet_addr_t src; + inet_addr_t dest; + uint8_t tos; + void *data; + size_t size; +} inet_dgram_t; + +typedef struct { + int (*recv)(inet_dgram_t *); +} inet_ev_ops_t; + +typedef enum { + INET_DF = 1 +} inet_df_t; + +extern int inet_init(uint8_t, inet_ev_ops_t *); +extern int inet_send(inet_dgram_t *, uint8_t, inet_df_t); +extern int inet_get_srcaddr(inet_addr_t *, uint8_t, inet_addr_t *); + +#endif + +/** @} + */ Index: uspace/lib/c/include/ipc/inet.h =================================================================== --- uspace/lib/c/include/ipc/inet.h (revision c76e9267a192002d0dc6f41f5e2984b3599ac46c) +++ uspace/lib/c/include/ipc/inet.h (revision c76e9267a192002d0dc6f41f5e2984b3599ac46c) @@ -0,0 +1,54 @@ +/* + * 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_INET_H_ +#define LIBC_IPC_INET_H_ + +#include + +typedef enum { + INET_CALLBACK_CREATE = IPC_FIRST_USER_METHOD, + INET_SEND, + INET_SET_PROTO +} inet_request_t; + +typedef enum { + INET_EV_RECV = IPC_FIRST_USER_METHOD +} inet_event_t; + +#endif + +/** + * @} + */ Index: uspace/lib/c/include/ipc/services.h =================================================================== --- uspace/lib/c/include/ipc/services.h (revision c8916d15d0b9a3ebcb74f63bfddee2a2188663df) +++ uspace/lib/c/include/ipc/services.h (revision c76e9267a192002d0dc6f41f5e2984b3599ac46c) @@ -52,4 +52,6 @@ } services_t; +#define SERVICE_NAME_INET "net/inet" + #endif