From b86f48da7fc46934d576698bb4f16be9b2a7eaf9 Mon Sep 17 00:00:00 2001 From: Miguel Date: Wed, 26 Sep 2018 23:58:14 +0200 Subject: some bugfixes --- net/arp.c | 2 +- net/icmp.c | 10 +++++----- net/ipv4.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'net') diff --git a/net/arp.c b/net/arp.c index 0a3b75c..e0cd4ec 100644 --- a/net/arp.c +++ b/net/arp.c @@ -117,7 +117,7 @@ void arp_incoming(struct netdev *netdev, struct eth_hdr *hdr) switch (arphdr->opcode) { case ARP_REQUEST: - klog("Arp Reply"); +// klog("Arp Reply"); arp_reply(netdev, hdr, arphdr); break; default: diff --git a/net/icmp.c b/net/icmp.c index 20ac203..d2e4de2 100644 --- a/net/icmp.c +++ b/net/icmp.c @@ -72,16 +72,16 @@ bool icmp_incoming(struct netdev *dev,struct eth_hdr *hdr) struct ipv4_hdr *ipv4=hdr->payload; struct icmp_v4 *data=(uint32_t *)ipv4+ipv4->ihl; - klog ("icmp type=%d",data->type); - klog ("icmp code=%d",data->code); - klog ("icmp csum=0x%04x",ntohs(data->csum)); +// klog ("icmp type=%d",data->type); +// klog ("icmp code=%d",data->code); +// klog ("icmp csum=0x%04x",ntohs(data->csum)); data->csum=0; - klog("expected checksum = 0x%04X",checksum(data,ntohs(ipv4->len)-ipv4->ihl*4)); +// klog("expected checksum = 0x%04X",checksum(data,ntohs(ipv4->len)-ipv4->ihl*4)); if(data->type==ICMP_ECHO_REQUEST) // echo request { struct icmp_v4_echo *echo=data->data; - klog ("received echo request id=%d, seq=%d, data=%d ",ntohs(echo->id),ntohs(echo->seq),echo->data); + //klog ("received echo request id=%d, seq=%d, data=%d ",ntohs(echo->id),ntohs(echo->seq),echo->data); icmp_reply(dev,hdr); /// TODO watchout that this is the memory managed by the network card we are dealing with!!. fix this later. } diff --git a/net/ipv4.c b/net/ipv4.c index b090a7b..c90733d 100644 --- a/net/ipv4.c +++ b/net/ipv4.c @@ -7,10 +7,10 @@ bool ipv4_incoming(struct netdev *dev,struct eth_hdr *hdr) { struct ipv4_hdr *ipv4=hdr->payload; - klog("ipv4 incoming with checksum: 0x%04X",ntohs(ipv4->csum)); +// klog("ipv4 incoming with checksum: 0x%04X",ntohs(ipv4->csum)); ipv4->csum=0; - klog("expected checksum: 0x%04X",checksum(ipv4,ntohs(ipv4->len))); - klog("ipv4 header len=%d",ipv4->ihl); +// klog("expected checksum: 0x%04X",checksum(ipv4,ntohs(ipv4->len))); +// klog("ipv4 header len=%d",ipv4->ihl); if(ipv4->proto==IPV4_P_ICMP) { -- cgit v1.2.3