X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Finterface.c;h=74f0cf83ab4b46264931772c2046508b85aa8fe2;hb=349e14ded0e8bf502cc9f672f3c6e2c6ec5f6fa1;hp=65380783712eb58da59a425a210d8cea370fc666;hpb=82adac267bc089391397b36413bba210a8e7c68f;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/interface.c b/Modules/IPStack/interface.c
index 65380783..74f0cf83 100644
--- a/Modules/IPStack/interface.c
+++ b/Modules/IPStack/interface.c
@@ -144,28 +144,6 @@ tVFS_Node *IPStack_Root_FindDir(tVFS_Node *Node, const char *Name)
 		return &gIP_LoopInterface.Node;
 	}
 	
-	#if 0
-	i = 0;	num = 0;
-	while('0' <= Name[i] && Name[i] <= '9')
-	{
-		num *= 10;
-		num += Name[i] - '0';
-		i ++;
-	}
-	if(Name[i] != '\0') {
-		LEAVE('n');
-		return NULL;
-	}
-	
-	for( iface = gIP_Interfaces; iface; iface = iface->Next )
-	{
-		if( (int)iface->Node.ImplInt == num )
-		{
-			LEAVE('p', &iface->Node);
-			return &iface->Node;
-		}
-	}
-	#else
 	for( iface = gIP_Interfaces; iface; iface = iface->Next )
 	{
 		if( strcmp(iface->Name, Name) == 0 )
@@ -174,7 +152,6 @@ tVFS_Node *IPStack_Root_FindDir(tVFS_Node *Node, const char *Name)
 			return &iface->Node;
 		}
 	}
-	#endif
 	
 	LEAVE('p', NULL);
 	return NULL;
@@ -204,6 +181,7 @@ int IPStack_Root_IOCtl(tVFS_Node *Node, int ID, void *Data)
 		{
 			char	name[4] = "";
 			tInterface	*iface = IPStack_AddInterface(Data, name);
+			if(iface == NULL)	LEAVE_RET('i', -1);
 			tmp = iface->Node.ImplInt;
 		}
 		LEAVE_RET('i', tmp);
@@ -226,6 +204,7 @@ tInterface *IPStack_AddInterface(const char *Device, const char *Name)
 	
 	card = IPStack_GetAdapter(Device);
 	if( !card ) {
+		Log_Debug("IPStack", "Unable to open card '%s'", Device);
 		LEAVE('n');
 		return NULL;	// ERR_YOURBAD
 	}
@@ -238,6 +217,7 @@ tInterface *IPStack_AddInterface(const char *Device, const char *Name)
 		+ IPStack_GetAddressSize(-1)*3	// Address, Route->Network, Route->NextHop
 		);
 	if(!iface) {
+		Log_Warning("IPStack", "AddInterface - malloc() failed");
 		LEAVE('n');
 		return NULL;	// Return ERR_MYBAD
 	}
@@ -266,12 +246,7 @@ tInterface *IPStack_AddInterface(const char *Device, const char *Name)
 	iface->TimeoutDelay = DEFAULT_TIMEOUT;
 	
 	// Get adapter handle
-	iface->Adapter = IPStack_GetAdapter(Device);
-	if( !iface->Adapter ) {
-		free( iface );
-		LEAVE('n');
-		return NULL;	// Return ERR_YOUFAIL
-	}
+	iface->Adapter = card;
 	
 	// Delay setting ImplInt until after the adapter is opened
 	// Keeps things simple
@@ -554,6 +529,7 @@ tAdapter *IPStack_GetAdapter(const char *Path)
 	// Ok, so let's open it
 	dev = malloc( sizeof(tAdapter) + strlen(Path) + 1 );
 	if(!dev) {
+		Log_Warning("IPStack", "GetAdapter - malloc() failed");
 		Mutex_Release( &glIP_Adapters );
 		LEAVE('n');
 		return NULL;
@@ -577,7 +553,7 @@ tAdapter *IPStack_GetAdapter(const char *Path)
 	tmp = VFS_IOCtl(dev->DeviceFD, 0, NULL);
 	LOG("Device type = %i", tmp);
 	if( tmp != DRV_TYPE_NETWORK ) {
-		Warning("IPStack_GetAdapter: '%s' is not a network interface", dev->Device);
+		Log_Warning("IPStack", "IPStack_GetAdapter: '%s' is not a network interface", dev->Device);
 		VFS_Close( dev->DeviceFD );
 		free( dev );
 		Mutex_Release( &glIP_Adapters );