From c7054d9470f337ecbe6df070705f5c8645b6dfac Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 18 Sep 2011 22:28:53 +0200 Subject: [PATCH] cosmetic changes --- kernel/echo.c | 112 +++++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 55 deletions(-) diff --git a/kernel/echo.c b/kernel/echo.c index 241f926f..db5abdcb 100644 --- a/kernel/echo.c +++ b/kernel/echo.c @@ -1,8 +1,8 @@ /* * Copyright (c) 2001-2003 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, @@ -11,31 +11,29 @@ * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 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 + * 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. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Adam Dunkels * */ -#include +#include #ifdef CONFIG_LWIP -//#include "tcpecho.h" - #include #if LWIP_NETCONN @@ -44,58 +42,62 @@ #include /*-----------------------------------------------------------------------------------*/ -static void +static void tcpecho_thread(void *arg) { - struct netconn *conn, *newconn; - err_t err; - LWIP_UNUSED_ARG(arg); + struct netconn *conn, *newconn; + err_t err; + LWIP_UNUSED_ARG(arg); - /* Create a new connection identifier. */ - conn = netconn_new(NETCONN_TCP); + /* Create a new connection identifier. */ + conn = netconn_new(NETCONN_TCP); - /* Bind connection to well known port number 7. */ - netconn_bind(conn, NULL, 7); + /* Bind connection to well known port number 7. */ + netconn_bind(conn, NULL, 7); - /* Tell connection to go into listening mode. */ - netconn_listen(conn); + /* Tell connection to go into listening mode. */ + netconn_listen(conn); - while (1) { + while (1) { - /* Grab new connection. */ - err = netconn_accept(conn, &newconn); - /*printf("accepted new connection %p\n", newconn);*/ - /* Process the new connection. */ - if (err == ERR_OK) { - struct netbuf *buf; - void *data; - u16_t len; - - while ((err = netconn_recv(newconn, &buf)) == ERR_OK) { - /*printf("Recved\n");*/ - do { - netbuf_data(buf, &data, &len); - err = netconn_write(newconn, data, len, NETCONN_COPY); + /* Grab new connection. */ + err = netconn_accept(conn, &newconn); + /* kprintf("accepted new connection %p\n", newconn); */ + /* Process the new connection. */ + if (err == ERR_OK) { + struct netbuf *buf; + void *data; + u16_t len; + + while ((err = netconn_recv(newconn, &buf)) == ERR_OK) { + /* kprintf("Recved\n"); */ + do { + netbuf_data(buf, &data, &len); + err = netconn_write(newconn, data, len, NETCONN_COPY); #if 0 - if (err != ERR_OK) { - printf("tcpecho: netconn_write: error \"%s\"\n", lwip_strerr(err)); - } + if (err != ERR_OK) { + kprintf("tcpecho: netconn_write: error \"%s\"\n", lwip_strerr(err)); + } #endif - } while (netbuf_next(buf) >= 0); - netbuf_delete(buf); - } - /*printf("Got EOF, looping\n");*/ - /* Close connection and discard connection identifier. */ - netconn_close(newconn); - netconn_delete(newconn); - } - } + } while (netbuf_next(buf) >= 0); + netbuf_delete(buf); + } + /* kprintf("Got EOF, looping\n"); */ + /* + * Close connection and discard connection + * identifier. + */ + netconn_close(newconn); + netconn_delete(newconn); + } + } } + /*-----------------------------------------------------------------------------------*/ void echo_init(void) { - sys_thread_new("tcpecho_thread", tcpecho_thread, NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO); + sys_thread_new("tcpecho_thread", tcpecho_thread, NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO); } /*-----------------------------------------------------------------------------------*/