From dc1a5f70ff52219a35b86d47609aa0fdd7ed4dbc Mon Sep 17 00:00:00 2001 From: joxe Date: Fri, 30 Apr 2010 13:20:57 +0000 Subject: [PATCH] added uip-debug utilities --- core/net/uip-debug.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ core/net/uip-debug.h | 73 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+) create mode 100644 core/net/uip-debug.c create mode 100644 core/net/uip-debug.h diff --git a/core/net/uip-debug.c b/core/net/uip-debug.c new file mode 100644 index 000000000..2695169f5 --- /dev/null +++ b/core/net/uip-debug.c @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2010, Swedish Institute of Computer Science. + * 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, this list of conditions and the following disclaimer. + * 2. 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. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``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 INSTITUTE OR CONTRIBUTORS 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. + * + * $Id: uip-debug.c,v 1.1 2010/04/30 13:20:57 joxe Exp $ + */ + +/** + * \file + * A set of debugging tools + * \author + * Nicolas Tsiftes + * Niclas Finne + * Joakim Eriksson + */ + +#include "net/uip-debug.h" +#include +/*---------------------------------------------------------------------------*/ +void +uip_debug_ipaddr_print(const uip_ipaddr_t *addr) +{ +#if UIP_CONF_IPV6 + uint16_t a; + int i, f; + for(i = 0, f = 0; i < sizeof(uip_ipaddr_t); i += 2) { + a = (addr->u8[i] << 8) + addr->u8[i + 1]; + if(a == 0 && f >= 0) { + if(f++ == 0) { + printf("::"); + } + } else { + if(f > 0) { + f = -1; + } else if(i > 0) { + printf(":"); + } + printf("%x", a); + } + } +#else /* UIP_CONF_IPV6 */ + printf("%u.%u.%u.%u", addr->u8[0], addr->u8[1], addr->u8[2], addr->u8[3]); +#endif /* UIP_CONF_IPV6 */ +} +/*---------------------------------------------------------------------------*/ +void +uip_debug_lladdr_print(const uip_lladdr_t *addr) +{ + int i; + for(i = 0; i < sizeof(uip_lladdr_t); i++) { + if(i > 0) { + printf(":"); + } + printf("%02x", addr->addr[i]); + } +} +/*---------------------------------------------------------------------------*/ diff --git a/core/net/uip-debug.h b/core/net/uip-debug.h new file mode 100644 index 000000000..c8467e51f --- /dev/null +++ b/core/net/uip-debug.h @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2010, Swedish Institute of Computer Science. + * 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, this list of conditions and the following disclaimer. + * 2. 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. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``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 INSTITUTE OR CONTRIBUTORS 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 Contiki operating system. + * + * $Id: uip-debug.h,v 1.1 2010/04/30 13:20:57 joxe Exp $ + */ +/** + * \file + * A set of debugging macros. + * + * \author Nicolas Tsiftes + * Niclas Finne + * Joakim Eriksson + */ + +#ifndef UIP_DEBUG_H +#define UIP_DEBUG_H + +#include "net/uip.h" + +void uip_debug_ipaddr_print(const uip_ipaddr_t *addr); +void uip_debug_lladdr_print(const uip_lladdr_t *addr); + +#define DEBUG_NONE 0 +#define DEBUG_PRINT 1 +#define DEBUG_ANNOTATE 2 +#define DEBUG_FULL DEBUG_ANNOTATE | DEBUG_PRINT + +#if (DEBUG) & DEBUG_ANNOTATE +#include +#define ANNOTATE(...) printf(__VA_ARGS__) +#else +#define ANNOTATE(...) +#endif /* (DEBUG) & DEBUG_ANNOTATE */ + +#if (DEBUG) & DEBUG_PRINT +#include +#define PRINTF(...) printf(__VA_ARGS__) +#define PRINT6ADDR(addr) uip_debug_ipaddr_print(addr) +#define PRINTLLADDR(lladdr) uip_debug_lladdr_print(lladdr) +#else +#define PRINTF(...) +#define PRINT6ADDR(addr) +#define PRINTLLADDR(lladdr) +#endif /* (DEBUG) & DEBUG_PRINT */ + +#endif