From e6eafcb86732068e2094f04a2452098c13256336 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 20 Nov 2010 13:59:37 +0800 Subject: [PATCH] Fixing route determining - Infinite loop due to bad memcmp implementation - Updating ping to support the new route code --- Makefile | 3 +- Modules/IPStack/arp.c | 13 ++++- Modules/IPStack/main.c | 2 +- Modules/IPStack/routing.c | 6 +-- Usermode/Applications/ifconfig_src/main.c | 6 +-- Usermode/Applications/ping_src/Makefile | 2 + Usermode/Applications/ping_src/main.c | 59 ++++++++++++++++------- 7 files changed, 64 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 0db9855a..bc4f1483 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,8 @@ SUBMAKE = $(MAKE) --no-print-directory USRLIBS := crt0.o acess.ld ld-acess.so libacess.so libgcc.so libc.so libnet.so -USRAPPS := init login CLIShell cat ls mount ifconfig +USRAPPS := init login CLIShell cat ls mount +USRAPPS += ifconfig ping ALL_DYNMODS = $(addprefix all-,$(DYNMODS)) ALL_MODULES := $(addprefix all-,$(MODULES)) diff --git a/Modules/IPStack/arp.c b/Modules/IPStack/arp.c index 476557e6..35532f6f 100644 --- a/Modules/IPStack/arp.c +++ b/Modules/IPStack/arp.c @@ -73,6 +73,7 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address) int lastID; int i; struct sArpRequest4 req; + Sint64 timeout; ENTER("pInterface xAddress", Interface, Address); @@ -129,10 +130,16 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address) // Send Request Link_SendPacket(Interface->Adapter, 0x0806, req.DestMac, sizeof(struct sArpRequest4), &req); + timeout = now() + Interface->TimeoutDelay; + // Wait for a reply for(;;) { - while(lastID == giARP_LastUpdateID) Threads_Yield(); + while(lastID == giARP_LastUpdateID && now() < timeout) + Threads_Yield(); + + if( now() >= timeout ) break; // Timeout + lastID = giARP_LastUpdateID; Mutex_Acquire( &glARP_Cache4 ); @@ -145,6 +152,10 @@ tMacAddr ARP_Resolve4(tInterface *Interface, tIPv4 Address) } Mutex_Release( &glARP_Cache4 ); } + { + tMacAddr ret = {{0,0,0,0,0,0}}; + return ret; + } } /** diff --git a/Modules/IPStack/main.c b/Modules/IPStack/main.c index ef1a2cd8..8e3810d9 100644 --- a/Modules/IPStack/main.c +++ b/Modules/IPStack/main.c @@ -122,7 +122,7 @@ int IPStack_CompareAddress(int AddressType, void *Address1, void *Address2, int if( CheckBits < 0 ) CheckBits = 0; if( CheckBits > size*8 ) CheckBits = size*8; - if( CheckBits == 0 ) return 1; // /0 matches anythin + if( CheckBits == 0 ) return 1; // /0 matches anythin0 // Check first bits/8 bytes if( memcmp(Address1, Address2, CheckBits/8) != 0 ) return 0; diff --git a/Modules/IPStack/routing.c b/Modules/IPStack/routing.c index c1060342..7c6ab2ac 100644 --- a/Modules/IPStack/routing.c +++ b/Modules/IPStack/routing.c @@ -2,7 +2,7 @@ * Acess2 IP Stack * - Routing Tables */ -#define DEBUG 0 +#define DEBUG 1 #define VERSION VER2(0,10) #include #include @@ -135,7 +135,7 @@ int IPStack_RouteDir_IOCtl(tVFS_Node *Node, int ID, void *Data) if( !CheckMem(Data, sizeof(int) + IPStack_GetAddressSize(data->Type)) ) LEAVE_RET('i', -1); - Log_Debug("IPStack", "Route_RouteDir_IOCtl - FindRoute %i, %s\n", + Log_Debug("IPStack", "Route_RouteDir_IOCtl - FindRoute %i, %s", data->Type, IPStack_PrintAddress(data->Type, data->Addr) ); rt = IPStack_FindRoute(data->Type, NULL, data->Addr); @@ -205,7 +205,7 @@ int IPStack_Route_Create(const char *InterfaceName) gIP_Routes = gIP_RoutesEnd = rt; } - Log_Log("IPStack", "Route entry for '%s' created\n", InterfaceName); + Log_Log("IPStack", "Route entry for '%s' created", InterfaceName); return rt->Node.Inode; } diff --git a/Usermode/Applications/ifconfig_src/main.c b/Usermode/Applications/ifconfig_src/main.c index c3ae3166..8d97d1b9 100644 --- a/Usermode/Applications/ifconfig_src/main.c +++ b/Usermode/Applications/ifconfig_src/main.c @@ -348,8 +348,8 @@ int DoAutoConfig(const char *Device) int tmp, fd; char path[sizeof(IPSTACK_ROOT)+1+4+1]; // /0000 uint8_t addr[4] = {10,0,2,55}; - uint8_t gw[4] = {10,0,2,1}; - int subnet = 8; + uint8_t gw[4] = {10,0,2,2}; + int subnet = 24; tmp = AddInterface(Device); if( tmp < 0 ) return tmp; @@ -376,7 +376,7 @@ int DoAutoConfig(const char *Device) // Set routes { uint8_t net[4] = {0,0,0,0}; - AddRoute(path + sizeof(IPSTACK_ROOT), addr, 8, net); // This interface + AddRoute(path + sizeof(IPSTACK_ROOT), addr, subnet, net); // This interface AddRoute(path + sizeof(IPSTACK_ROOT), net, 0, gw); // Gateway } diff --git a/Usermode/Applications/ping_src/Makefile b/Usermode/Applications/ping_src/Makefile index 5d94dbef..4d44a338 100644 --- a/Usermode/Applications/ping_src/Makefile +++ b/Usermode/Applications/ping_src/Makefile @@ -2,6 +2,8 @@ -include ../Makefile.cfg +LDFLAGS += -lnet + OBJ = main.o BIN = ../ping diff --git a/Usermode/Applications/ping_src/main.c b/Usermode/Applications/ping_src/main.c index 79205451..4c8c84de 100644 --- a/Usermode/Applications/ping_src/main.c +++ b/Usermode/Applications/ping_src/main.c @@ -6,6 +6,7 @@ #include #include #include +#include // === CONSTANTS === #define IPSTACK_ROOT "/Devices/ip" @@ -15,6 +16,9 @@ void PrintUsage(char *ProgName); void PrintHelp(char *ProgName); int GetAddress( char *Address, uint8_t *Addr ); +// === GLOBALS === + int giNumberOfPings = 1; + // === CODE === /** * \fn int main(int argc, char *argv[]) @@ -27,6 +31,8 @@ int main(int argc, char *argv[]) int i, j; uint8_t addr[16]; int type; + + int fd, call, ping; for(i = 1; i < argc; i++) { @@ -69,7 +75,7 @@ int main(int argc, char *argv[]) } // Read Address - type = GetAddress(ipStr, addr); + type = Net_ParseAddress(ipStr, addr); if( type == 0 ) { fprintf(stderr, "Invalid IP Address\n"); return 1; @@ -77,28 +83,45 @@ int main(int argc, char *argv[]) if( !iface ) { - fprintf(stderr, "WARNING: \"All interfaces\" is currently uniplemented"); - return 2; + iface = Net_GetInterface(type, addr); + if( !iface ) { + fprintf(stderr, "Unable to find a route to '%s'\n", + Net_PrintAddress(type, addr) + ); + return -1; + } + + printf("iface = '%s'\n", iface); } - else + { - int fd = open(iface, OPENFLAG_EXEC); - int call, ping; - if(fd == -1) { - fprintf(stderr, "ERROR: Unable to open interface '%s'\n", iface); - return 1; - } + char *_iface = malloc( sizeof("/Devices/ip/") + strlen(iface) + 1 ); + strcpy(_iface, "/Devices/ip/"); + strcat(_iface, iface); + free(iface); // TODO: Handle when this is not heap + iface = _iface; + printf("iface = '%s'\n", iface); + } + + fd = open(iface, OPENFLAG_EXEC); + if(fd == -1) { + fprintf(stderr, "ERROR: Unable to open interface '%s'\n", iface); + return 1; + } - call = ioctl(fd, 3, "ping"); - if(call == 0) { - fprintf(stderr, "ERROR: '%s' does not have a 'ping' call\n", iface); - return 1; - } + call = ioctl(fd, 3, "ping"); + if(call == 0) { + fprintf(stderr, "ERROR: '%s' does not have a 'ping' call\n", iface); + return 1; + } + + for( i = 0; i < giNumberOfPings; i ++ ) + { ping = ioctl(fd, call, addr); - printf("ping = %i\n"); - - close(fd); + printf("ping = %i\n", ping); } + + close(fd); return 0; } -- 2.20.1