From 35f03318dedb1b430175e8005b64896424a644ef Mon Sep 17 00:00:00 2001 From: John Hodge Date: Mon, 18 Jan 2010 13:55:40 +0800 Subject: [PATCH] Fixes and logging --- Kernel/Makefile.BuildNum | 2 +- Modules/IPStack/ipv4.c | 2 ++ Modules/IPStack/main.c | 10 ++-------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum index fb947585..83ad29a9 100644 --- a/Kernel/Makefile.BuildNum +++ b/Kernel/Makefile.BuildNum @@ -1 +1 @@ -BUILD_NUM = 1369 +BUILD_NUM = 1370 diff --git a/Modules/IPStack/ipv4.c b/Modules/IPStack/ipv4.c index 282e71bb..933b90ba 100644 --- a/Modules/IPStack/ipv4.c +++ b/Modules/IPStack/ipv4.c @@ -74,6 +74,8 @@ int IPv4_SendPacket(tInterface *Iface, tIPv4 Address, int Protocol, int ID, int hdr->Destination = Address; hdr->HeaderChecksum = htons( IPv4_Checksum(hdr, sizeof(tIPv4Header)) ); + Log("[IPv4 ] Sending packet to %i.%i.%i.%i", + Address.B[0], Address.B[1], Address.B[2], Address.B[3]); Link_SendPacket(Iface->Adapter, IPV4_ETHERNET_ID, to, bufSize, buf); return 1; } diff --git a/Modules/IPStack/main.c b/Modules/IPStack/main.c index 1a581735..76a18f0b 100644 --- a/Modules/IPStack/main.c +++ b/Modules/IPStack/main.c @@ -192,10 +192,7 @@ int IPStack_IOCtlRoot(tVFS_Node *Node, int ID, void *Data) case DRV_IOCTL_LOOKUP: if( !CheckString( Data ) ) LEAVE_RET('i', -1); LOG("Lookup '%s'", Data); - if( Node == &gIP_DriverInfo.RootNode ) - tmp = LookupString( (char**)casIOCtls_Root, (char*)Data ); - else - tmp = LookupString( (char**)casIOCtls_Iface, (char*)Data ); + tmp = LookupString( (char**)casIOCtls_Root, (char*)Data ); LEAVE('i', tmp); return tmp; @@ -251,10 +248,7 @@ int IPStack_IOCtl(tVFS_Node *Node, int ID, void *Data) case DRV_IOCTL_LOOKUP: if( !CheckString( Data ) ) LEAVE_RET('i', -1); LOG("Lookup '%s'", Data); - if( Node == &gIP_DriverInfo.RootNode ) - tmp = LookupString( (char**)casIOCtls_Root, (char*)Data ); - else - tmp = LookupString( (char**)casIOCtls_Iface, (char*)Data ); + tmp = LookupString( (char**)casIOCtls_Iface, (char*)Data ); LEAVE('i', tmp); return tmp; -- 2.20.1