Index: boot/Makefile.common =================================================================== --- boot/Makefile.common (revision 96cbd18e89b261c95fc443d94beaaab8cbaa29d5) +++ boot/Makefile.common (revision 89ac55135165454a51d40d8fa82bf99517b61933) @@ -116,4 +116,5 @@ $(USPACE_PATH)/srv/net/inetsrv/inetsrv \ $(USPACE_PATH)/srv/net/loopip/loopip \ + $(USPACE_PATH)/srv/net/slip/slip \ $(USPACE_PATH)/srv/net/tcp/tcp \ $(USPACE_PATH)/srv/net/udp/udp \ Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 96cbd18e89b261c95fc443d94beaaab8cbaa29d5) +++ uspace/Makefile (revision 89ac55135165454a51d40d8fa82bf99517b61933) @@ -88,4 +88,5 @@ srv/net/inetsrv \ srv/net/loopip \ + srv/net/slip \ srv/net/tcp \ srv/net/udp \ Index: uspace/drv/char/ns8250/ns8250.c =================================================================== --- uspace/drv/char/ns8250/ns8250.c (revision 96cbd18e89b261c95fc443d94beaaab8cbaa29d5) +++ uspace/drv/char/ns8250/ns8250.c (revision 89ac55135165454a51d40d8fa82bf99517b61933) @@ -160,6 +160,6 @@ /** I/O registers **/ ns8250_regs_t *regs; - /** Is there any client connected to the device? */ - bool client_connected; + /** Are there any clients connected to the device? */ + unsigned client_connections; /** The irq assigned to this device. */ int irq; @@ -753,5 +753,5 @@ uint8_t val = ns8250_read_8(regs); - if (ns->client_connected) { + if (ns->client_connections > 0) { bool buf_was_empty = buf_is_empty(&ns->input_buffer); if (!buf_push_back(&ns->input_buffer, val)) { @@ -914,5 +914,5 @@ fibril_mutex_lock(&ns->mutex); - if (ns->client_connected) { + if (ns->client_connections > 0) { fibril_mutex_unlock(&ns->mutex); return EBUSY; @@ -948,11 +948,9 @@ fibril_mutex_lock(&ns->mutex); - if (ns->client_connected) { - res = ELIMIT; - } else if (ns->removed) { + if (ns->removed) { res = ENXIO; } else { res = EOK; - ns->client_connected = true; + ns->client_connections++; } fibril_mutex_unlock(&ns->mutex); @@ -974,8 +972,8 @@ fibril_mutex_lock(&data->mutex); - assert(data->client_connected); - - data->client_connected = false; - buf_clear(&data->input_buffer); + assert(data->client_connections > 0); + + if (!(--data->client_connections)) + buf_clear(&data->input_buffer); fibril_mutex_unlock(&data->mutex); Index: uspace/srv/net/slip/Makefile =================================================================== --- uspace/srv/net/slip/Makefile (revision 89ac55135165454a51d40d8fa82bf99517b61933) +++ uspace/srv/net/slip/Makefile (revision 89ac55135165454a51d40d8fa82bf99517b61933) @@ -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 = slip + +SOURCES = \ + slip.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/slip/slip.c =================================================================== --- uspace/srv/net/slip/slip.c (revision 89ac55135165454a51d40d8fa82bf99517b61933) +++ uspace/srv/net/slip/slip.c (revision 89ac55135165454a51d40d8fa82bf99517b61933) @@ -0,0 +1,400 @@ +/* + * Copyright (c) 2013 Jakub Jermar + * 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 slip + * @{ + */ +/** + * @file + * @brief IP over serial line IP link provider. + */ + +#include +#include +#include +#include +#include +#include +#include + +#define NAME "slip" +#define CAT_IPLINK "iplink" + +#define SLIP_MTU 1006 /* as per RFC 1055 */ + +#define SLIP_END 0300 +#define SLIP_ESC 0333 +#define SLIP_ESC_END 0334 +#define SLIP_ESC_ESC 0335 + +static int slip_open(iplink_srv_t *); +static int slip_close(iplink_srv_t *); +static int slip_send(iplink_srv_t *, iplink_srv_sdu_t *); +static int slip_get_mtu(iplink_srv_t *, size_t *); +static int slip_addr_add(iplink_srv_t *, iplink_srv_addr_t *); +static int slip_addr_remove(iplink_srv_t *, iplink_srv_addr_t *); + +static iplink_srv_t slip_iplink; + +static iplink_ops_t slip_iplink_ops = { + .open = slip_open, + .close = slip_close, + .send = slip_send, + .get_mtu = slip_get_mtu, + .addr_add = slip_addr_add, + .addr_remove = slip_addr_remove +}; + +static uint8_t slip_send_buf[SLIP_MTU + 2]; +static size_t slip_send_pending; + +static uint8_t slip_recv_buf[SLIP_MTU + 2]; +static size_t slip_recv_pending; +static size_t slip_recv_read; + +int slip_open(iplink_srv_t *srv) +{ + log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_open()"); + return EOK; +} + +int slip_close(iplink_srv_t *srv) +{ + log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_close()"); + return EOK; +} + +static void write_flush(async_sess_t *sess) +{ + size_t written = 0; + + while (slip_send_pending > 0) { + ssize_t size; + + size = char_dev_write(sess, &slip_send_buf[written], + slip_send_pending); + if (size < 0) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "char_dev_write() returned %d", + (int) size); + slip_send_pending = 0; + break; + } + written += size; + slip_send_pending -= size; + } +} + +static void write_buffered(async_sess_t *sess, uint8_t ch) +{ + if (slip_send_pending == sizeof(slip_send_buf)) + write_flush(sess); + slip_send_buf[slip_send_pending++] = ch; +} + +int slip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu) +{ + async_sess_t *sess = (async_sess_t *) srv->arg; + uint8_t *data = sdu->data; + unsigned i; + + log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send()"); + + /* + * Strictly speaking, this is not prescribed by the RFC, but the RFC + * suggests to start with sending a SLIP_END byte as a synchronization + * measure for dealing with previous possible noise on the line. + */ + write_buffered(sess, SLIP_END); + + for (i = 0; i < sdu->size; i++) { + switch (data[i]) { + case SLIP_END: + write_buffered(sess, SLIP_ESC); + write_buffered(sess, SLIP_ESC_END); + break; + case SLIP_ESC: + write_buffered(sess, SLIP_ESC); + write_buffered(sess, SLIP_ESC_ESC); + break; + default: + write_buffered(sess, data[i]); + break; + } + } + write_buffered(sess, SLIP_END); + write_flush(sess); + + return EOK; +} + +int slip_get_mtu(iplink_srv_t *srv, size_t *mtu) +{ + log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_get_mtu()"); + *mtu = SLIP_MTU; + return EOK; +} + +int slip_addr_add(iplink_srv_t *srv, iplink_srv_addr_t *addr) +{ + log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_addr_add()"); + return EOK; +} + +int slip_addr_remove(iplink_srv_t *srv, iplink_srv_addr_t *addr) +{ + log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_addr_remove()"); + return EOK; +} + +static void usage(void) +{ + printf("Usage: " NAME " \n"); +} + +static void slip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) +{ + log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_client_conn()"); + iplink_conn(iid, icall, &slip_iplink); +} + +static uint8_t read_buffered(async_sess_t *sess) +{ + while (slip_recv_pending == 0) { + ssize_t size; + + size = char_dev_read(sess, slip_recv_buf, + sizeof(slip_recv_buf)); + if (size < 0) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "char_dev_read() returned %d", (int) size); + return SLIP_END; + } + slip_recv_pending = size; + slip_recv_read = 0; + } + slip_recv_pending--; + return slip_recv_buf[slip_recv_read++]; +} + +static int slip_recv_fibril(void *arg) +{ + async_sess_t *sess = (async_sess_t *) arg; + static uint8_t recv_final[SLIP_MTU]; + iplink_srv_sdu_t sdu; + uint8_t ch; + int rc; + + sdu.lsrc.ipv4 = 0; + sdu.ldest.ipv4 = 0; + sdu.data = recv_final; + + while (true) { + for (sdu.size = 0; sdu.size < sizeof(recv_final); /**/) { + ch = read_buffered(sess); + switch (ch) { + case SLIP_END: + if (sdu.size == 0) { + /* + * Discard the empty SLIP datagram. + */ + break; + } + goto pass; + + case SLIP_ESC: + ch = read_buffered(sess); + if (ch == SLIP_ESC_END) { + recv_final[sdu.size++] = SLIP_END; + break; + } else if (ch == SLIP_ESC_ESC) { + recv_final[sdu.size++] = SLIP_ESC; + break; + } + + /* + * The RFC suggests to simply insert the wrongly + * escaped character into the packet so we fall + * through. + */ + + default: + recv_final[sdu.size++] = ch; + break; + } + + } + + /* + * We have reached the limit of our MTU. Regardless of whether + * the datagram is properly ended with SLIP_END, pass it along. + * If the next character is really SLIP_END, nothing + * catastrophic happens. The algorithm will just see an + * artificially empty SLIP datagram and life will go on. + */ + +pass: + rc = iplink_ev_recv(&slip_iplink, &sdu); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "iplink_ev_recv() returned %d", rc); + } + } + + return 0; +} + +static int slip_init(const char *svcstr, const char *linkstr) +{ + service_id_t svcid; + service_id_t linksid; + category_id_t iplinkcid; + async_sess_t *sess_in = NULL; + async_sess_t *sess_out = NULL; + fid_t fid; + int rc; + + iplink_srv_init(&slip_iplink); + slip_iplink.ops = &slip_iplink_ops; + + async_set_client_connection(slip_client_conn); + + rc = loc_server_register(NAME); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "Failed registering server."); + return rc; + } + + rc = loc_service_get_id(svcstr, &svcid, 0); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "Failed getting ID for service %s", svcstr); + return rc; + } + + rc = loc_category_get_id(CAT_IPLINK, &iplinkcid, 0); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "Failed to get category ID for %s", + CAT_IPLINK); + return rc; + } + + /* + * Create two sessions to allow to both read and write from the + * char_dev at the same time. + */ + sess_out = loc_service_connect(EXCHANGE_SERIALIZE, svcid, 0); + if (!sess_out) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "Failed to connect to service %s (ID=%d)", + svcstr, (int) svcid); + return rc; + } + slip_iplink.arg = sess_out; + + sess_in = loc_service_connect(EXCHANGE_SERIALIZE, svcid, 0); + if (!sess_in) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "Failed to connect to service %s (ID=%d)", + svcstr, (int) svcid); + goto fail; + } + + rc = loc_service_register(linkstr, &linksid); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "Failed to register service %s", + linkstr); + goto fail; + } + + rc = loc_service_add_to_cat(linksid, iplinkcid); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "Failed to add service %d (%s) to category %d (%s).", + (int) linksid, linkstr, (int) iplinkcid, CAT_IPLINK); + goto fail; + } + + fid = fibril_create(slip_recv_fibril, sess_in); + if (!fid) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "Failed to create receive fibril."); + goto fail; + } + fibril_add_ready(fid); + + return EOK; + +fail: + if (sess_out) + async_hangup(sess_out); + if (sess_in) + async_hangup(sess_in); + + /* + * We assume that our registration at the location service will be + * cleaned up automatically as the service (i.e. this task) terminates. + */ + + return rc; +} + +int main(int argc, char *argv[]) +{ + int rc; + + printf(NAME ": IP over serial line service\n"); + + if (argc != 3) { + usage(); + return EINVAL; + } + + rc = log_init(NAME); + if (rc != EOK) { + printf(NAME ": failed to initialize log\n"); + return rc; + } + + rc = slip_init(argv[1], argv[2]); + if (rc != EOK) + return 1; + + printf(NAME ": Accepting connections.\n"); + task_retval(0); + async_manager(); + + /* not reached */ + return 0; +} + +/** @} + */