diff options
Diffstat (limited to 'nuttx/net/uip')
-rw-r--r-- | nuttx/net/uip/uip-arp.c | 28 | ||||
-rw-r--r-- | nuttx/net/uip/uip-icmpinput.c | 12 | ||||
-rw-r--r-- | nuttx/net/uip/uip-input.c | 16 | ||||
-rw-r--r-- | nuttx/net/uip/uip-neighbor.c | 12 | ||||
-rw-r--r-- | nuttx/net/uip/uip-tcpappsend.c | 8 | ||||
-rw-r--r-- | nuttx/net/uip/uip-tcpcallback.c | 6 | ||||
-rw-r--r-- | nuttx/net/uip/uip-tcpinput.c | 26 | ||||
-rw-r--r-- | nuttx/net/uip/uip-tcpsend.c | 2 | ||||
-rw-r--r-- | nuttx/net/uip/uip-tcptimer.c | 4 | ||||
-rw-r--r-- | nuttx/net/uip/uip-udpcallback.c | 2 | ||||
-rw-r--r-- | nuttx/net/uip/uip-udpinput.c | 4 | ||||
-rw-r--r-- | nuttx/net/uip/uip-udpsend.c | 2 |
12 files changed, 61 insertions, 61 deletions
diff --git a/nuttx/net/uip/uip-arp.c b/nuttx/net/uip/uip-arp.c index 9b74d0507..2cc80c40a 100644 --- a/nuttx/net/uip/uip-arp.c +++ b/nuttx/net/uip/uip-arp.c @@ -140,20 +140,20 @@ static uint8 g_arptime; #if defined(CONFIG_NET_DUMPARP) && defined(CONFIG_DEBUG) static void uip_arp_dump(struct arp_hdr *arp) { - dbg(" HW type: %04x Protocol: %04x\n", - arp->ah_hwtype, arp->ah_protocol);\ - dbg(" HW len: %02x Proto len: %02x Operation: %04x\n", - arp->ah_hwlen, arp->ah_protolen, arp->ah_opcode); - dbg(" Sender MAC: %02x:%02x:%02x:%02x:%02x:%02x IP: %d.%d.%d.%d\n", - arp->ah_shwaddr[0], arp->ah_shwaddr[1], arp->ah_shwaddr[2], - arp->ah_shwaddr[3], arp->ah_shwaddr[4], arp->ah_shwaddr[5], - arp->ah_sipaddr[0] & 0xff, arp->ah_sipaddr[0] >> 8, - arp->ah_sipaddr[1] & 0xff, arp->ah_sipaddr[1] >> 8); - dbg(" Dest MAC: %02x:%02x:%02x:%02x:%02x:%02x IP: %d.%d.%d.%d\n", - arp->ah_dhwaddr[0], arp->ah_dhwaddr[1], arp->ah_dhwaddr[2], - arp->ah_dhwaddr[3], arp->ah_dhwaddr[4], arp->ah_dhwaddr[5], - arp->ah_dipaddr[0] & 0xff, arp->ah_dipaddr[0] >> 8, - arp->ah_dipaddr[1] & 0xff, arp->ah_dipaddr[1] >> 8); + ndbg(" HW type: %04x Protocol: %04x\n", + arp->ah_hwtype, arp->ah_protocol);\ + ndbg(" HW len: %02x Proto len: %02x Operation: %04x\n", + arp->ah_hwlen, arp->ah_protolen, arp->ah_opcode); + ndbg(" Sender MAC: %02x:%02x:%02x:%02x:%02x:%02x IP: %d.%d.%d.%d\n", + arp->ah_shwaddr[0], arp->ah_shwaddr[1], arp->ah_shwaddr[2], + arp->ah_shwaddr[3], arp->ah_shwaddr[4], arp->ah_shwaddr[5], + arp->ah_sipaddr[0] & 0xff, arp->ah_sipaddr[0] >> 8, + arp->ah_sipaddr[1] & 0xff, arp->ah_sipaddr[1] >> 8); + ndbg(" Dest MAC: %02x:%02x:%02x:%02x:%02x:%02x IP: %d.%d.%d.%d\n", + arp->ah_dhwaddr[0], arp->ah_dhwaddr[1], arp->ah_dhwaddr[2], + arp->ah_dhwaddr[3], arp->ah_dhwaddr[4], arp->ah_dhwaddr[5], + arp->ah_dipaddr[0] & 0xff, arp->ah_dipaddr[0] >> 8, + arp->ah_dipaddr[1] & 0xff, arp->ah_dipaddr[1] >> 8); } #else # define uip_arp_dump(arp) diff --git a/nuttx/net/uip/uip-icmpinput.c b/nuttx/net/uip/uip-icmpinput.c index 5dae94bd7..2f14945b7 100644 --- a/nuttx/net/uip/uip-icmpinput.c +++ b/nuttx/net/uip/uip-icmpinput.c @@ -110,7 +110,7 @@ void uip_icmpinput(struct uip_driver_s *dev) if (ICMPBUF->type != ICMP_ECHO) { - dbg("Unknown ICMP cmd: %d\n", ICMPBUF->type); + ndbg("Unknown ICMP cmd: %d\n", ICMPBUF->type); goto typeerr; } @@ -142,8 +142,8 @@ void uip_icmpinput(struct uip_driver_s *dev) uiphdr_ipaddr_copy(ICMPBUF->destipaddr, ICMPBUF->srcipaddr); uiphdr_ipaddr_copy(ICMPBUF->srcipaddr, &dev->d_ipaddr); - vdbg("Outgoing ICMP packet length: %d (%d)\n", - dev->d_len, (ICMPBUF->len[0] << 8) | ICMPBUF->len[1]); + nvdbg("Outgoing ICMP packet length: %d (%d)\n", + dev->d_len, (ICMPBUF->len[0] << 8) | ICMPBUF->len[1]); #ifdef CONFIG_NET_STATISTICS uip_stat.icmp.sent++; @@ -213,12 +213,12 @@ typeerr: } else { - dbg("Unknown ICMP6 cmd: %d\n", ICMPBUF->type); + ndbg("Unknown ICMP6 cmd: %d\n", ICMPBUF->type); goto typeerr; } - vdbg("Outgoing ICMP6 packet length: %d (%d)\n", - dev->d_len, (ICMPBUF->len[0] << 8) | ICMPBUF->len[1]); + nvdbg("Outgoing ICMP6 packet length: %d (%d)\n", + dev->d_len, (ICMPBUF->len[0] << 8) | ICMPBUF->len[1]); #ifdef CONFIG_NET_STATISTICS uip_stat.icmp.sent++; diff --git a/nuttx/net/uip/uip-input.c b/nuttx/net/uip/uip-input.c index 6ee748c89..da9049efb 100644 --- a/nuttx/net/uip/uip-input.c +++ b/nuttx/net/uip/uip-input.c @@ -313,7 +313,7 @@ void uip_input(struct uip_driver_s *dev) uip_stat.ip.drop++; uip_stat.ip.vhlerr++; #endif - dbg("Invalid IPv6 version: %d\n", BUF->vtc >> 4); + ndbg("Invalid IPv6 version: %d\n", BUF->vtc >> 4); goto drop; } #else /* CONFIG_NET_IPv6 */ @@ -327,7 +327,7 @@ void uip_input(struct uip_driver_s *dev) uip_stat.ip.drop++; uip_stat.ip.vhlerr++; #endif - dbg("Invalid IP version or header length: %02x\n", BUF->vhl); + ndbg("Invalid IP version or header length: %02x\n", BUF->vhl); goto drop; } #endif /* CONFIG_NET_IPv6 */ @@ -356,7 +356,7 @@ void uip_input(struct uip_driver_s *dev) } else { - dbg("IP packet shorter than length in IP header\n"); + ndbg("IP packet shorter than length in IP header\n"); goto drop; } @@ -376,7 +376,7 @@ void uip_input(struct uip_driver_s *dev) uip_stat.ip.drop++; uip_stat.ip.fragerr++; #endif - dbg("IP fragment dropped\n"); + ndbg("IP fragment dropped\n"); goto drop; #endif /* UIP_REASSEMBLY */ } @@ -392,14 +392,14 @@ void uip_input(struct uip_driver_s *dev) #if defined(CONFIG_NET_PINGADDRCONF) && !defined(CONFIG_NET_IPv6) if (BUF->proto == UIP_PROTO_ICMP) { - dbg("Possible ping config packet received\n"); + ndbg("Possible ping config packet received\n"); uip_icmpinput(dev); goto done; } else #endif { - dbg("No IP address assigned\n"); + ndbg("No IP address assigned\n"); goto drop; } } @@ -454,7 +454,7 @@ void uip_input(struct uip_driver_s *dev) uip_stat.ip.drop++; uip_stat.ip.chkerr++; #endif - dbg("Bad IP checksum\n"); + ndbg("Bad IP checksum\n"); goto drop; } #endif /* CONFIG_NET_IPv6 */ @@ -495,7 +495,7 @@ void uip_input(struct uip_driver_s *dev) uip_stat.ip.protoerr++; #endif - dbg("Unrecognized IP protocol\n"); + ndbg("Unrecognized IP protocol\n"); goto drop; } diff --git a/nuttx/net/uip/uip-neighbor.c b/nuttx/net/uip/uip-neighbor.c index 0e849bac1..353fd11cf 100644 --- a/nuttx/net/uip/uip-neighbor.c +++ b/nuttx/net/uip/uip-neighbor.c @@ -81,9 +81,9 @@ void uip_neighbor_add(uip_ipaddr_t ipaddr, struct uip_neighbor_addr *addr) int i, oldest; uint8 oldest_time; - dbg("Add neighbor: %02x:%02x:%02x:%02x:%02x:%02x\n", - addr->addr.addr[0], addr->addr.addr[1], addr->addr.addr[2], - addr->addr.addr[3], addr->addr.addr[4], addr->addr.addr[5]); + ndbg("Add neighbor: %02x:%02x:%02x:%02x:%02x:%02x\n", + addr->addr.addr[0], addr->addr.addr[1], addr->addr.addr[2], + addr->addr.addr[3], addr->addr.addr[4], addr->addr.addr[5]); /* Find the first unused entry or the oldest used entry. */ @@ -149,9 +149,9 @@ struct uip_neighbor_addr *uip_neighbor_lookup(uip_ipaddr_t ipaddr) e = find_entry(ipaddr); if (e != NULL) { - dbg("Lookup neighbor: %02x:%02x:%02x:%02x:%02x:%02x\n", - e->addr.addr.addr[0], e->addr.addr.addr[1], e->addr.addr.addr[2], - e->addr.addr.addr[3], e->addr.addr.addr[4], e->addr.addr.addr[5]); + ndbg("Lookup neighbor: %02x:%02x:%02x:%02x:%02x:%02x\n", + e->addr.addr.addr[0], e->addr.addr.addr[1], e->addr.addr.addr[2], + e->addr.addr.addr[3], e->addr.addr.addr[4], e->addr.addr.addr[5]); return &e->addr; } diff --git a/nuttx/net/uip/uip-tcpappsend.c b/nuttx/net/uip/uip-tcpappsend.c index f26f897bb..2ef57004b 100644 --- a/nuttx/net/uip/uip-tcpappsend.c +++ b/nuttx/net/uip/uip-tcpappsend.c @@ -98,7 +98,7 @@ void uip_tcpappsend(struct uip_driver_s *dev, struct uip_conn *conn, uint8 resul { /* Handle the result based on the application response */ - vdbg("result: %02x\n", result); + nvdbg("result: %02x\n", result); /* Check for connection aborted */ @@ -106,7 +106,7 @@ void uip_tcpappsend(struct uip_driver_s *dev, struct uip_conn *conn, uint8 resul { dev->d_sndlen = 0; conn->tcpstateflags = UIP_CLOSED; - vdbg("TCP state: UIP_CLOSED\n"); + nvdbg("TCP state: UIP_CLOSED\n"); uip_tcpsend(dev, conn, TCP_RST | TCP_ACK, UIP_IPTCPH_LEN); } @@ -118,7 +118,7 @@ void uip_tcpappsend(struct uip_driver_s *dev, struct uip_conn *conn, uint8 resul conn->tcpstateflags = UIP_FIN_WAIT_1; conn->len = 1; conn->nrtx = 0; - vdbg("TCP state: UIP_FIN_WAIT_1\n"); + nvdbg("TCP state: UIP_FIN_WAIT_1\n"); dev->d_sndlen = 0; uip_tcpsend(dev, conn, TCP_FIN | TCP_ACK, UIP_IPTCPH_LEN); @@ -204,7 +204,7 @@ void uip_tcpappsend(struct uip_driver_s *dev, struct uip_conn *conn, uint8 resul void uip_tcprexmit(struct uip_driver_s *dev, struct uip_conn *conn, uint8 result) { - vdbg("result: %02x\n", result); + nvdbg("result: %02x\n", result); dev->d_appdata = dev->d_snddata; diff --git a/nuttx/net/uip/uip-tcpcallback.c b/nuttx/net/uip/uip-tcpcallback.c index 1694a9ab4..845c49a81 100644 --- a/nuttx/net/uip/uip-tcpcallback.c +++ b/nuttx/net/uip/uip-tcpcallback.c @@ -110,7 +110,7 @@ uip_dataevent(struct uip_driver_s *dev, struct uip_conn *conn, uint8 flags) memcpy(readahead->rh_buffer, dev->d_appdata, recvlen); readahead->rh_nbytes = recvlen; - vdbg("Buffered %d bytes (of %d)\n", recvlen, dev->d_len); + nvdbg("Buffered %d bytes (of %d)\n", recvlen, dev->d_len); /* Save the readahead buffer in the connection structure where * it can be found with recv() is called. @@ -167,7 +167,7 @@ uint8 uip_tcpcallback(struct uip_driver_s *dev, struct uip_conn *conn, uint8 fla uint8 ret = flags; - vdbg("flags: %02x\n", flags); + nvdbg("flags: %02x\n", flags); /* Check if there is a data callback */ @@ -192,7 +192,7 @@ uint8 uip_tcpcallback(struct uip_driver_s *dev, struct uip_conn *conn, uint8 fla { /* There is no handler to receive new data in place */ - vdbg("No listener on connection\n"); + nvdbg("No listener on connection\n"); ret = uip_dataevent(dev, conn, flags); } diff --git a/nuttx/net/uip/uip-tcpinput.c b/nuttx/net/uip/uip-tcpinput.c index e3271263a..11fb7cee0 100644 --- a/nuttx/net/uip/uip-tcpinput.c +++ b/nuttx/net/uip/uip-tcpinput.c @@ -120,7 +120,7 @@ void uip_tcpinput(struct uip_driver_s *dev) uip_stat.tcp.drop++; uip_stat.tcp.chkerr++; #endif - dbg("Bad TCP checksum\n"); + ndbg("Bad TCP checksum\n"); goto drop; } @@ -184,7 +184,7 @@ void uip_tcpinput(struct uip_driver_s *dev) #ifdef CONFIG_NET_STATISTICS uip_stat.tcp.syndrop++; #endif - dbg("No free TCP connections\n"); + ndbg("No free TCP connections\n"); goto drop; } @@ -279,7 +279,7 @@ found: if (BUF->flags & TCP_RST) { conn->tcpstateflags = UIP_CLOSED; - dbg("RESET - TCP state: UIP_CLOSED\n"); + ndbg("RESET - TCP state: UIP_CLOSED\n"); (void)uip_tcpcallback(dev, conn, UIP_ABORT); goto drop; @@ -396,7 +396,7 @@ found: { conn->tcpstateflags = UIP_ESTABLISHED; conn->len = 0; - vdbg("TCP state: UIP_ESTABLISHED\n"); + nvdbg("TCP state: UIP_ESTABLISHED\n"); flags = UIP_CONNECTED; @@ -481,7 +481,7 @@ found: conn->rcv_nxt[1] = BUF->seqno[1]; conn->rcv_nxt[2] = BUF->seqno[2]; conn->rcv_nxt[3] = BUF->seqno[3]; - vdbg("TCP state: UIP_ESTABLISHED\n"); + nvdbg("TCP state: UIP_ESTABLISHED\n"); uip_incr32(conn->rcv_nxt, 1); conn->len = 0; @@ -499,7 +499,7 @@ found: /* The connection is closed after we send the RST */ conn->tcpstateflags = UIP_CLOSED; - vdbg("Connection failed - TCP state: UIP_CLOSED\n"); + nvdbg("Connection failed - TCP state: UIP_CLOSED\n"); /* We do not send resets in response to resets. */ @@ -543,7 +543,7 @@ found: conn->tcpstateflags = UIP_LAST_ACK; conn->len = 1; conn->nrtx = 0; - vdbg("TCP state: UIP_LAST_ACK\n"); + nvdbg("TCP state: UIP_LAST_ACK\n"); uip_tcpsend(dev, conn, TCP_FIN | TCP_ACK, UIP_IPTCPH_LEN); return; @@ -648,7 +648,7 @@ found: if (flags & UIP_ACKDATA) { conn->tcpstateflags = UIP_CLOSED; - vdbg("UIP_LAST_ACK TCP state: UIP_CLOSED\n"); + nvdbg("UIP_LAST_ACK TCP state: UIP_CLOSED\n"); (void)uip_tcpcallback(dev, conn, UIP_CLOSE); } @@ -671,12 +671,12 @@ found: conn->tcpstateflags = UIP_TIME_WAIT; conn->timer = 0; conn->len = 0; - vdbg("TCP state: UIP_TIME_WAIT\n"); + nvdbg("TCP state: UIP_TIME_WAIT\n"); } else { conn->tcpstateflags = UIP_CLOSING; - vdbg("TCP state: UIP_CLOSING\n"); + nvdbg("TCP state: UIP_CLOSING\n"); } uip_incr32(conn->rcv_nxt, 1); @@ -688,7 +688,7 @@ found: { conn->tcpstateflags = UIP_FIN_WAIT_2; conn->len = 0; - vdbg("TCP state: UIP_FIN_WAIT_2\n"); + nvdbg("TCP state: UIP_FIN_WAIT_2\n"); goto drop; } @@ -709,7 +709,7 @@ found: { conn->tcpstateflags = UIP_TIME_WAIT; conn->timer = 0; - vdbg("TCP state: UIP_TIME_WAIT\n"); + nvdbg("TCP state: UIP_TIME_WAIT\n"); uip_incr32(conn->rcv_nxt, 1); (void)uip_tcpcallback(dev, conn, UIP_CLOSE); @@ -733,7 +733,7 @@ found: { conn->tcpstateflags = UIP_TIME_WAIT; conn->timer = 0; - vdbg("TCP state: UIP_TIME_WAIT\n"); + nvdbg("TCP state: UIP_TIME_WAIT\n"); } default: diff --git a/nuttx/net/uip/uip-tcpsend.c b/nuttx/net/uip/uip-tcpsend.c index 1729dd75b..ae58ad576 100644 --- a/nuttx/net/uip/uip-tcpsend.c +++ b/nuttx/net/uip/uip-tcpsend.c @@ -139,7 +139,7 @@ static void uip_tcpsendcomplete(struct uip_driver_s *dev) #endif /* CONFIG_NET_IPv6 */ - vdbg("Outgoing TCP packet length: %d (%d)\n", + nvdbg("Outgoing TCP packet length: %d (%d)\n", dev->d_len, (BUF->len[0] << 8) | BUF->len[1]); #ifdef CONFIG_NET_STATISTICS diff --git a/nuttx/net/uip/uip-tcptimer.c b/nuttx/net/uip/uip-tcptimer.c index 3679808d3..e0da04ead 100644 --- a/nuttx/net/uip/uip-tcptimer.c +++ b/nuttx/net/uip/uip-tcptimer.c @@ -123,7 +123,7 @@ void uip_tcptimer(struct uip_driver_s *dev, struct uip_conn *conn, int hsec) if (conn->timer >= UIP_TIME_WAIT_TIMEOUT) { conn->tcpstateflags = UIP_CLOSED; - vdbg("TCP state: UIP_CLOSED\n"); + nvdbg("TCP state: UIP_CLOSED\n"); } } else if (conn->tcpstateflags != UIP_CLOSED) @@ -157,7 +157,7 @@ void uip_tcptimer(struct uip_driver_s *dev, struct uip_conn *conn, int hsec) conn->nrtx == UIP_MAXSYNRTX)) { conn->tcpstateflags = UIP_CLOSED; - vdbg("TCP state: UIP_CLOSED\n"); + nvdbg("TCP state: UIP_CLOSED\n"); /* We call uip_tcpcallback() with UIP_TIMEDOUT to * inform the application that the connection has diff --git a/nuttx/net/uip/uip-udpcallback.c b/nuttx/net/uip/uip-udpcallback.c index 29ee7d736..ae5187913 100644 --- a/nuttx/net/uip/uip-udpcallback.c +++ b/nuttx/net/uip/uip-udpcallback.c @@ -76,7 +76,7 @@ void uip_udpcallback(struct uip_driver_s *dev, struct uip_udp_conn *conn, uint8 flags) { - vdbg("flags: %02x\n", flags); + nvdbg("flags: %02x\n", flags); /* Some sanity checking */ diff --git a/nuttx/net/uip/uip-udpinput.c b/nuttx/net/uip/uip-udpinput.c index 46e673402..45863d9c8 100644 --- a/nuttx/net/uip/uip-udpinput.c +++ b/nuttx/net/uip/uip-udpinput.c @@ -111,7 +111,7 @@ void uip_udpinput(struct uip_driver_s *dev) uip_stat.udp.drop++; uip_stat.udp.chkerr++; #endif - dbg("Bad UDP checksum\n"); + ndbg("Bad UDP checksum\n"); dev->d_len = 0; } else @@ -141,7 +141,7 @@ void uip_udpinput(struct uip_driver_s *dev) } else { - dbg("No listener on UDP port\n"); + ndbg("No listener on UDP port\n"); dev->d_len = 0; } } diff --git a/nuttx/net/uip/uip-udpsend.c b/nuttx/net/uip/uip-udpsend.c index 8936c64bd..563d31a81 100644 --- a/nuttx/net/uip/uip-udpsend.c +++ b/nuttx/net/uip/uip-udpsend.c @@ -163,7 +163,7 @@ void uip_udpsend(struct uip_driver_s *dev, struct uip_udp_conn *conn) UDPBUF->udpchksum = 0; #endif - vdbg("Outgoing UDP packet length: %d (%d)\n", + nvdbg("Outgoing UDP packet length: %d (%d)\n", dev->d_len, (UDPBUF->len[0] << 8) | UDPBUF->len[1]); #ifdef CONFIG_NET_STATISTICS |