X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Fmain.c;h=da7441c4fa94d11f6bff3051bf6907faacda1cda;hb=deb8a310abcb8ef8b6afef74a1fa058777740b3f;hp=9b132ec8e91c3202e084900a9aa49503f695964a;hpb=872dbea3900b09c78092d3cdf035513f400bcfe8;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/main.c b/Modules/IPStack/main.c
index 9b132ec8..da7441c4 100644
--- a/Modules/IPStack/main.c
+++ b/Modules/IPStack/main.c
@@ -97,7 +97,7 @@ int IPStack_Install(char **Arguments)
  */
 int IPStack_AddFile(tSocketFile *File)
 {
-	Log("IPStack_AddFile: %s", File->Name);
+	Log_Log("IPStack", "Added file '%s'", File->Name);
 	File->Next = gIP_FileTemplates;
 	gIP_FileTemplates = File;
 	return 0;
@@ -122,6 +122,11 @@ char *IPStack_Root_ReadDir(tVFS_Node *Node, int Pos)
 	}
 	
 	name = malloc(4);
+	if(!name) {
+		Log_Warning("IPStack", "IPStack_Root_ReadDir - malloc error");
+		LEAVE('n');
+		return NULL;
+	}
 	
 	// Create the name
 	Pos = iface->Node.ImplInt;
@@ -231,7 +236,6 @@ char *IPStack_Iface_ReadDir(tVFS_Node *Node, int Pos)
 {
 	tSocketFile	*file = gIP_FileTemplates;
 	while(Pos-- && file) {
-		Log("IPStack_Iface_ReadDir: %s", file->Name);
 		file = file->Next;
 	}
 	
@@ -251,7 +255,6 @@ tVFS_Node *IPStack_Iface_FindDir(tVFS_Node *Node, char *Name)
 	for(;file;file = file->Next)
 	{
 		if( strcmp(file->Name, Name) == 0 )	break;
-		Log("IPStack_Iface_FindDir: strcmp('%s', '%s')", file->Name, Name);
 	}
 	if(!file)	return NULL;
 	
@@ -513,9 +516,12 @@ int IPStack_Iface_IOCtl(tVFS_Node *Node, int ID, void *Data)
 int IPStack_AddInterface(char *Device)
 {
 	tInterface	*iface;
+	tAdapter	*card;
 	
 	ENTER("sDevice", Device);
 	
+	card = IPStack_GetAdapter(Device);
+	
 	iface = malloc(sizeof(tInterface));
 	if(!iface) {
 		LEAVE('i', -2);
@@ -527,7 +533,6 @@ int IPStack_AddInterface(char *Device)
 	
 	// Create Node
 	iface->Node.ImplPtr = iface;
-	iface->Node.ImplInt = giIP_NextIfaceId++;
 	iface->Node.Flags = VFS_FFLAG_DIRECTORY;
 	iface->Node.Size = -1;
 	iface->Node.NumACLs = 1;
@@ -535,6 +540,10 @@ int IPStack_AddInterface(char *Device)
 	iface->Node.ReadDir = IPStack_Iface_ReadDir;
 	iface->Node.FindDir = IPStack_Iface_FindDir;
 	iface->Node.IOCtl = IPStack_Iface_IOCtl;
+	iface->Node.MkNod = NULL;
+	iface->Node.Link = NULL;
+	iface->Node.Relink = NULL;
+	iface->Node.Close = NULL;
 	
 	// Set Defaults
 	iface->TimeoutDelay = DEFAULT_TIMEOUT;
@@ -547,6 +556,10 @@ int IPStack_AddInterface(char *Device)
 		return -1;	// Return ERR_YOUFAIL
 	}
 	
+	// Delay setting ImplInt until after the adapter is opened
+	// Keeps things simple
+	iface->Node.ImplInt = giIP_NextIfaceId++;
+	
 	// Append to list
 	LOCK( &glIP_Interfaces );
 	if( gIP_Interfaces ) {