Index: boot/Makefile.common =================================================================== --- boot/Makefile.common (revision f834f90da2aad0e9ecdcb36a1c4d411482550692) +++ boot/Makefile.common (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) @@ -99,4 +99,5 @@ $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \ $(USPACE_PATH)/srv/clip/clip \ + $(USPACE_PATH)/srv/ethip/ethip \ $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \ $(USPACE_PATH)/srv/fs/fat/fat \ Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision f834f90da2aad0e9ecdcb36a1c4d411482550692) +++ uspace/Makefile (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) @@ -71,4 +71,5 @@ srv/loc \ srv/devman \ + srv/ethip \ srv/inet \ srv/loader \ Index: uspace/srv/ethip/Makefile =================================================================== --- uspace/srv/ethip/Makefile (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) +++ uspace/srv/ethip/Makefile (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) @@ -0,0 +1,35 @@ +# +# 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. +# + +USPACE_PREFIX = ../.. +BINARY = ethip + +SOURCES = \ + ethip.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/ethip/ethip.c =================================================================== --- uspace/srv/ethip/ethip.c (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) +++ uspace/srv/ethip/ethip.c (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) @@ -0,0 +1,155 @@ +/* + * 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 inet + * @{ + */ +/** + * @file + * @brief IP link provider for Ethernet + */ + +#include +#include +#include +#include +#include +#include + +#define NAME "eth" + +static int ethip_open(iplink_conn_t *conn); +static int ethip_close(iplink_conn_t *conn); +static int ethip_send(iplink_conn_t *conn, iplink_srv_sdu_t *sdu); +static int ethip_get_mtu(iplink_conn_t *conn, size_t *mtu); + +static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg); + +static iplink_ops_t ethip_iplink_ops = { + .open = ethip_open, + .close = ethip_close, + .send = ethip_send, + .get_mtu = ethip_get_mtu +}; + +static iplink_srv_t test_srv; + +static int ethip_init(void) +{ + int rc; + service_id_t sid; + category_id_t iplink_cat; + + test_srv.ops = ðip_iplink_ops; + test_srv.arg = NULL; + + async_set_client_connection(ethip_client_conn); + + rc = loc_server_register(NAME); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed registering server."); + return rc; + } + + rc = loc_service_register("net/eth0", &sid); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed registering service net/eth0."); + return rc; + } + + rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed resolving category 'iplink'."); + return rc; + } + + rc = loc_service_add_to_cat(sid, iplink_cat); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed adding net/eth0 to category."); + return rc; + } + + return EOK; +} + +static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) +{ + log_msg(LVL_DEBUG, "ethip_client_conn()"); + iplink_conn(iid, icall, &test_srv); +} + +static int ethip_open(iplink_conn_t *conn) +{ + log_msg(LVL_DEBUG, "ethip_open()"); + return EOK; +} + +static int ethip_close(iplink_conn_t *conn) +{ + log_msg(LVL_DEBUG, "ethip_open()"); + return EOK; +} + +static int ethip_send(iplink_conn_t *conn, iplink_srv_sdu_t *sdu) +{ + log_msg(LVL_DEBUG, "ethip_send()"); + return EOK; +} + +static int ethip_get_mtu(iplink_conn_t *conn, size_t *mtu) +{ + log_msg(LVL_DEBUG, "ethip_get_mtu()"); + *mtu = 1500; + return EOK; +} + +int main(int argc, char *argv[]) +{ + int rc; + + printf(NAME ": HelenOS IP over Ethernet service\n"); + + if (log_init(NAME, LVL_DEBUG) != EOK) { + printf(NAME ": Failed to initialize logging.\n"); + return 1; + } + + rc = ethip_init(); + if (rc != EOK) + return 1; + + printf(NAME ": Accepting connections.\n"); + task_retval(0); + async_manager(); + + /* Not reached */ + return 0; +} + +/** @} + */ Index: uspace/srv/inet/Makefile =================================================================== --- uspace/srv/inet/Makefile (revision f834f90da2aad0e9ecdcb36a1c4d411482550692) +++ uspace/srv/inet/Makefile (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) @@ -31,5 +31,6 @@ SOURCES = \ - inet.c + inet.c \ + inet_link.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/inet/inet.c =================================================================== --- uspace/srv/inet/inet.c (revision f834f90da2aad0e9ecdcb36a1c4d411482550692) +++ uspace/srv/inet/inet.c (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) @@ -48,4 +48,5 @@ #include "inet.h" +#include "inet_link.h" #define NAME "inet" @@ -76,4 +77,8 @@ return EEXIST; } + + rc = inet_link_discovery_start(); + if (rc != EOK) + return EEXIST; return EOK; @@ -238,8 +243,8 @@ int rc; - printf(NAME ": HelenOS Internet Protocol service"); + printf(NAME ": HelenOS Internet Protocol service\n"); if (log_init(NAME, LVL_DEBUG) != EOK) { - printf(NAME ": Failed to initialize logging."); + printf(NAME ": Failed to initialize logging.\n"); return 1; } Index: uspace/srv/inet/inet_link.c =================================================================== --- uspace/srv/inet/inet_link.c (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) +++ uspace/srv/inet/inet_link.c (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) @@ -0,0 +1,201 @@ +/* + * 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 inet + * @{ + */ +/** + * @file + * @brief + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "inet_link.h" + +static int inet_link_open(service_id_t sid); +static int inet_iplink_recv(iplink_t *ilink, iplink_sdu_t *sdu); + +typedef struct { + link_t link_list; + service_id_t svc_id; + char *svc_name; + async_sess_t *sess; + iplink_t *iplink; +} inet_link_t; + +static iplink_ev_ops_t inet_iplink_ev_ops = { + .recv = inet_iplink_recv +}; + +static LIST_INITIALIZE(inet_link_list); +static FIBRIL_MUTEX_INITIALIZE(inet_discovery_lock); + +static int inet_iplink_recv(iplink_t *ilink, iplink_sdu_t *sdu) +{ + log_msg(LVL_DEBUG, "inet_iplink_recv()"); + return EOK; +} + +static int inet_link_check_new(void) +{ + bool already_known; + category_id_t iplink_cat; + service_id_t *svcs; + size_t count, i; + int rc; + + fibril_mutex_lock(&inet_discovery_lock); + + rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed resolving category 'iplink'."); + fibril_mutex_unlock(&inet_discovery_lock); + return ENOENT; + } + + rc = loc_category_get_svcs(iplink_cat, &svcs, &count); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed getting list of IP links."); + fibril_mutex_unlock(&inet_discovery_lock); + return EIO; + } + + for (i = 0; i < count; i++) { + already_known = false; + + list_foreach(inet_link_list, ilink_link) { + inet_link_t *ilink = list_get_instance(ilink_link, + inet_link_t, link_list); + if (ilink->svc_id == svcs[i]) { + already_known = true; + break; + } + } + + if (!already_known) { + log_msg(LVL_DEBUG, "Found IP link '%lu'", + (unsigned long) svcs[i]); + rc = inet_link_open(svcs[i]); + if (rc != EOK) + log_msg(LVL_ERROR, "Could not open IP link."); + } + } + + fibril_mutex_unlock(&inet_discovery_lock); + return EOK; +} + +static inet_link_t *inet_link_new(void) +{ + inet_link_t *ilink = calloc(1, sizeof(inet_link_t)); + + if (ilink == NULL) { + log_msg(LVL_ERROR, "Failed allocating link structure. " + "Out of memory."); + return NULL; + } + + link_initialize(&ilink->link_list); + + return ilink; +} + +static void inet_link_delete(inet_link_t *ilink) +{ + if (ilink->svc_name != NULL) + free(ilink->svc_name); + free(ilink); +} + +static int inet_link_open(service_id_t sid) +{ + inet_link_t *ilink; + int rc; + + log_msg(LVL_DEBUG, "inet_link_open()"); + ilink = inet_link_new(); + if (ilink == NULL) + return ENOMEM; + + rc = loc_service_get_name(sid, &ilink->svc_name); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed getting service name."); + goto error; + } + + ilink->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0); + if (ilink->sess == NULL) { + log_msg(LVL_ERROR, "Failed connecting '%s'", ilink->svc_name); + goto error; + } + + rc = iplink_open(ilink->sess, &inet_iplink_ev_ops, &ilink->iplink); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed opening IP link '%s'", + ilink->svc_name); + goto error; + } + + log_msg(LVL_DEBUG, "Opened IP link '%s'", ilink->svc_name); + list_append(&ilink->link_list, &inet_link_list); + + return EOK; + +error: + inet_link_delete(ilink); + return rc; +} + +static void inet_link_cat_change_cb(void) +{ + (void) inet_link_check_new(); +} + +int inet_link_discovery_start(void) +{ + int rc; + + rc = loc_register_cat_change_cb(inet_link_cat_change_cb); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed registering callback for IP link " + "discovery (%d).", rc); + return rc; + } + + return inet_link_check_new(); +} + +/** @} + */ Index: uspace/srv/inet/inet_link.h =================================================================== --- uspace/srv/inet/inet_link.h (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) +++ uspace/srv/inet/inet_link.h (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) @@ -0,0 +1,45 @@ +/* + * 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 inet + * @{ + */ +/** + * @file + * @brief + */ + +#ifndef INET_LINK_H_ +#define INET_LINK_H_ + +extern int inet_link_discovery_start(void); + +#endif + +/** @} + */ Index: uspace/srv/loc/loc.c =================================================================== --- uspace/srv/loc/loc.c (revision f834f90da2aad0e9ecdcb36a1c4d411482550692) +++ uspace/srv/loc/loc.c (revision e2e56e6766826103b6b7b98baac8f8d7ae826855) @@ -1296,4 +1296,7 @@ categ_dir_add_cat(&cdir, cat); + cat = category_new("iplink"); + categ_dir_add_cat(&cdir, cat); + cat = category_new("keyboard"); categ_dir_add_cat(&cdir, cat);