From 8f0d0f25ed7fc104a1924101bf73158c879f75f0 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 4 Jan 2010 15:58:55 +0100 Subject: [PATCH] replace ET_DEBUG with pr_debug Signed-off-by: Sascha Hauer --- net/net.c | 69 +++++++++++++++++++----------------------------------- net/ping.c | 4 +--- net/tftp.c | 2 -- 3 files changed, 25 insertions(+), 50 deletions(-) diff --git a/net/net.c b/net/net.c index 9818f420a..7dc1bc676 100644 --- a/net/net.c +++ b/net/net.c @@ -153,9 +153,8 @@ void ArpRequest (void) uchar *pkt; ARP_t *arp; -#ifdef ET_DEBUG - printf ("ARP broadcast\n"); -#endif + pr_debug("ARP broadcast\n"); + pkt = NetTxPacket; pkt += NetSetEther (pkt, NetBcastAddr, PROT_ARP); @@ -379,10 +378,8 @@ NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, int len) /* if MAC address was not discovered yet, save the packet and do an ARP request */ if (memcmp(ether, NetEtherNullAddr, 6) == 0) { + pr_debug("sending ARP for %08lx\n", dest); -#ifdef ET_DEBUG - printf("sending ARP for %08lx\n", dest); -#endif NetArpWaitPacketIP = dest; NetArpWaitPacketMAC = ether; @@ -401,10 +398,8 @@ NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, int len) return 1; /* waiting */ } -#ifdef ET_DEBUG - printf("sending UDP to %08lx/%02x:%02x:%02x:%02x:%02x:%02x\n", + pr_debug("sending UDP to %08lx/%02x:%02x:%02x:%02x:%02x:%02x\n", dest, ether[0], ether[1], ether[2], ether[3], ether[4], ether[5]); -#endif pkt = (uchar *)NetTxPacket; pkt += NetSetEther (pkt, ether, PROT_IP); @@ -425,9 +420,7 @@ NetReceive(uchar * inpkt, int len) uchar *pkt; ushort cti = 0, vlanid = VLAN_NONE, myvlanid, mynvlanid; -#ifdef ET_DEBUG - printf("packet received\n"); -#endif + pr_debug("packet received\n"); NetRxPkt = inpkt; NetRxPktLen = len; @@ -446,9 +439,7 @@ NetReceive(uchar * inpkt, int len) x = ntohs(et->et_protlen); -#ifdef ET_DEBUG - printf("packet received\n"); -#endif + pr_debug("packet received\n"); if (x < 1514) { /* @@ -466,9 +457,8 @@ NetReceive(uchar * inpkt, int len) } else { /* VLAN packet */ VLAN_Ethernet_t *vet = (VLAN_Ethernet_t *)et; -#ifdef ET_DEBUG - printf("VLAN packet received\n"); -#endif + pr_debug("VLAN packet received\n"); + /* too small packet? */ if (len < VLAN_ETHER_HDR_SIZE) return; @@ -486,9 +476,7 @@ NetReceive(uchar * inpkt, int len) len -= VLAN_ETHER_HDR_SIZE; } -#ifdef ET_DEBUG - printf("Receive from protocol 0x%x\n", x); -#endif + pr_debug("Receive from protocol 0x%x\n", x); if ((myvlanid & VLAN_IDMASK) != VLAN_NONE) { if (vlanid == VLAN_NONE) @@ -510,9 +498,8 @@ NetReceive(uchar * inpkt, int len) * address; so if we receive such a packet, we set * the server ethernet address */ -#ifdef ET_DEBUG - puts ("Got ARP\n"); -#endif + pr_debug("Got ARP\n"); + arp = (ARP_t *)ip; if (len < ARP_HDR_SIZE) { printf("bad length %d < %d\n", len, ARP_HDR_SIZE); @@ -541,9 +528,8 @@ NetReceive(uchar * inpkt, int len) switch (ntohs(arp->ar_op)) { case ARPOP_REQUEST: /* reply with our IP address */ -#ifdef ET_DEBUG - puts ("Got ARP REQUEST, return our IP\n"); -#endif + pr_debug("Got ARP REQUEST, return our IP\n"); + pkt = (uchar *)et; pkt += NetSetEther(pkt, et->et_src, PROT_ARP); arp->ar_op = htons(ARPOP_REPLY); @@ -559,20 +545,17 @@ NetReceive(uchar * inpkt, int len) /* are we waiting for a reply */ if (!NetArpWaitPacketIP || !NetArpWaitPacketMAC) break; -#ifdef ET_DEBUG - printf("Got ARP REPLY, set server/gtwy eth addr (%02x:%02x:%02x:%02x:%02x:%02x)\n", + pr_debug("Got ARP REPLY, set server/gtwy eth addr (%02x:%02x:%02x:%02x:%02x:%02x)\n", arp->ar_data[0], arp->ar_data[1], arp->ar_data[2], arp->ar_data[3], arp->ar_data[4], arp->ar_data[5]); -#endif tmp = NetReadIP(&arp->ar_data[6]); /* matched waiting packet's address */ if (tmp == NetArpWaitReplyIP) { -#ifdef ET_DEBUG - puts ("Got it\n"); -#endif + pr_debug("Got it\n"); + /* save address for later use */ memcpy(NetArpWaitPacketMAC, &arp->ar_data[0], 6); @@ -588,17 +571,14 @@ NetReceive(uchar * inpkt, int len) } return; default: -#ifdef ET_DEBUG - printf("Unexpected ARP opcode 0x%x\n", ntohs(arp->ar_op)); -#endif + pr_debug("Unexpected ARP opcode 0x%x\n", ntohs(arp->ar_op)); return; } break; case PROT_RARP: -#ifdef ET_DEBUG - puts ("Got RARP\n"); -#endif + pr_debug("Got RARP\n"); + arp = (ARP_t *)ip; if (len < ARP_HDR_SIZE) { printf("bad length %d < %d\n", len, ARP_HDR_SIZE); @@ -622,9 +602,8 @@ NetReceive(uchar * inpkt, int len) break; case PROT_IP: -#ifdef ET_DEBUG - puts ("Got IP\n"); -#endif + pr_debug("Got IP\n"); + if (len < IP_HDR_SIZE) { debug ("len bad %d < %d\n", len, IP_HDR_SIZE); return; @@ -634,9 +613,9 @@ NetReceive(uchar * inpkt, int len) return; } len = ntohs(ip->ip_len); -#ifdef ET_DEBUG - printf("len=%d, v=%02x\n", len, ip->ip_hl_v & 0xff); -#endif + + pr_debug("len=%d, v=%02x\n", len, ip->ip_hl_v & 0xff); + if ((ip->ip_hl_v & 0xf0) != 0x40) { return; } diff --git a/net/ping.c b/net/ping.c index 8759fd73a..1bc481af4 100644 --- a/net/ping.c +++ b/net/ping.c @@ -18,9 +18,7 @@ static int PingSend(void) memcpy(mac, NetEtherNullAddr, 6); -#ifdef ET_DEBUG - printf("sending ARP for %08lx\n", NetPingIP); -#endif + pr_debug("sending ARP for %08lx\n", NetPingIP); NetArpWaitPacketIP = NetPingIP; NetArpWaitPacketMAC = mac; diff --git a/net/tftp.c b/net/tftp.c index 897bc4899..26f0c43df 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -15,8 +15,6 @@ #include #include "tftp.h" -#undef ET_DEBUG - #define WELL_KNOWN_PORT 69 /* Well known TFTP port # */ #define TIMEOUT 5 /* Seconds to timeout for a lost pkt */ # define TIMEOUT_COUNT 10 /* # of timeouts before giving up */