diff --git a/src/add-ons/kernel/network/core/mbuf.c b/src/add-ons/kernel/network/core/mbuf.c index 2940fe9a6d..b670dbef44 100644 --- a/src/add-ons/kernel/network/core/mbuf.c +++ b/src/add-ons/kernel/network/core/mbuf.c @@ -304,16 +304,16 @@ void m_copydata(struct mbuf *m, int off, int len, caddr_t cp) uint count = 0; if (off < 0) { - printf("m_copydata: off %d < 0", off); + printf("m_copydata: off %d < 0\n", off); return; } if (len < 0) { - printf("m_copydata: len %d < 0", len); + printf("m_copydata: len %d < 0\n", len); return; } while (off > 0) { if (m == NULL) { - printf("m_copydata: null mbuf in skip"); + printf("m_copydata: null mbuf in skip\n"); return; } if (off < (int) m->m_len) @@ -323,7 +323,7 @@ void m_copydata(struct mbuf *m, int off, int len, caddr_t cp) } while (len > 0) { if (m == NULL) { - printf("m_copydata: null mbuf"); + printf("m_copydata: null mbuf\n"); return; } count = min((int) m->m_len - off, len); diff --git a/src/add-ons/kernel/network/interfaces/ethernet/ethernet.c b/src/add-ons/kernel/network/interfaces/ethernet/ethernet.c index abeb609cc9..6de450f2c3 100644 --- a/src/add-ons/kernel/network/interfaces/ethernet/ethernet.c +++ b/src/add-ons/kernel/network/interfaces/ethernet/ethernet.c @@ -289,21 +289,19 @@ static void find_devices(void) return; } -#if SHOW_DEBUG +#if DEBUG static void dump_ether_details(struct mbuf *buf) { struct ether_header *eth = mtod(buf, struct ether_header *); - - printf("Ethernet packet from "); - print_ether_addr(ð->src); - printf(" to "); - print_ether_addr(ð->dest); - + + printf("Ethernet packet from %s", ether_sprintf(eth->ether_shost)); + printf(" to %s", ether_sprintf(eth->ether_dhost)); + if (buf->m_flags & M_BCAST) printf(" BCAST"); - + printf(" proto "); - switch (eth->type) { + switch (eth->ether_type) { case ETHER_ARP: printf("ARP\n"); break; @@ -316,8 +314,16 @@ static void dump_ether_details(struct mbuf *buf) case ETHER_IPV6: printf("IPv6\n"); break; + case ETHER_PPPOE_DISC: + printf("PPPoE Discovery\n"); + break; + + case ETHER_PPPOE_SESS: + printf("PPPoE Session\n"); + break; + default: - printf("unknown (%04x)\n", eth->type); + printf("unknown (%04x)\n", eth->ether_type); } } #endif @@ -343,8 +349,8 @@ int32 ether_input(void *data) if (eth->ether_dhost[0] & 1) m->m_flags |= M_MCAST; -#if SHOW_DEBUG - dump_ether_details(buf); +#if DEBUG + dump_ether_details(m); #endif // as PPPoE needs the ethernet header we process it before m_adj if(eth->ether_type == ETHERTYPE_PPPOEDISC