X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FIPStack%2Finterface.c;h=ea4295420f8369650a4c137ed810d62e28359b3c;hb=c1b33e91984102c1aa9a2ffe19f02c315b481726;hp=9ab4b9ae5bb360ef5d0429fa93c5651d7553b195;hpb=d0b4559f2936f6d9f06be0f7c3c51527a480ec0d;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/IPStack/interface.c b/KernelLand/Modules/IPStack/interface.c
index 9ab4b9ae..ea429542 100644
--- a/KernelLand/Modules/IPStack/interface.c
+++ b/KernelLand/Modules/IPStack/interface.c
@@ -22,14 +22,14 @@ extern tVFS_Node	gIP_AdaptersNode;
 
 // === PROTOTYPES ===
  int	IPStack_Root_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX]);
-tVFS_Node	*IPStack_Root_FindDir(tVFS_Node *Node, const char *Name);
+tVFS_Node	*IPStack_Root_FindDir(tVFS_Node *Node, const char *Name, Uint Flags);
  int	IPStack_Root_IOCtl(tVFS_Node *Node, int ID, void *Data);
 
  int	IPStack_AddFile(tSocketFile *File);
-tInterface	*IPStack_AddInterface(const char *Device, const char *Name);
+tInterface	*IPStack_AddInterface(const char *Device, int Type, const char *Name);
 
  int	IPStack_Iface_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX]);
-tVFS_Node	*IPStack_Iface_FindDir(tVFS_Node *Node, const char *Name);
+tVFS_Node	*IPStack_Iface_FindDir(tVFS_Node *Node, const char *Name, Uint Flags);
  int	IPStack_Iface_IOCtl(tVFS_Node *Node, int ID, void *Data);
 
 // === GLOBALS ===
@@ -101,8 +101,7 @@ int IPStack_Root_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX])
 	}
 	
 	// Create the name
-	Pos = iface->Node.ImplInt;
-	snprintf(Dest, FILENAME_MAX, "%i", Pos);
+	strncpy(Dest, iface->Name, FILENAME_MAX);
 	
 	LEAVE('i', 0);
 	return 0;
@@ -111,11 +110,8 @@ int IPStack_Root_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX])
 /**
  * \brief Get the node of an interface
  */
-tVFS_Node *IPStack_Root_FindDir(tVFS_Node *Node, const char *Name)
+tVFS_Node *IPStack_Root_FindDir(tVFS_Node *Node, const char *Name, Uint Flags)
 {
-	#if 0
-	 int	i, num;
-	#endif
 	tInterface	*iface;
 	
 	ENTER("pNode sName", Node, Name);
@@ -167,19 +163,32 @@ int IPStack_Root_IOCtl(tVFS_Node *Node, int ID, void *Data)
 		
 	/*
 	 * add_interface
-	 * - Adds a new IP interface and binds it to a device
+	 * - Adds a new interface and binds it to a device
 	 */
-	case 4:
-		if( Threads_GetUID() != 0 )	LEAVE_RET('i', -1);
-		if( !CheckString( Data ) )	LEAVE_RET('i', -1);
-		LOG("New interface for '%s'", Data);
-		{
-			char	name[4] = "";
-			tInterface	*iface = IPStack_AddInterface(Data, name);
-			if(iface == NULL)	LEAVE_RET('i', -1);
-			tmp = iface->Node.ImplInt;
-		}
+	case 4: {
+		const struct {
+			const char *Device;
+			const char *Name;
+			 int	Type;
+		} *ifinfo = Data;
+		
+		if( Threads_GetUID() != 0 )
+			LEAVE_RET('i', -1);
+		if( !CheckMem(ifinfo, sizeof(*ifinfo)) )
+			LEAVE_RET('i', -1);
+		if( !MM_IsUser(ifinfo->Device) || !CheckString( ifinfo->Device ) )
+			LEAVE_RET('i', -1);
+		if( !MM_IsUser(ifinfo->Name) || !CheckString( ifinfo->Name ) )
+			LEAVE_RET('i', -1);
+
+		LOG("New interface of type %i for '%s' named '%s'",
+			ifinfo->Type, ifinfo->Device, ifinfo->Name);
+		tInterface *iface = IPStack_AddInterface(ifinfo->Device, ifinfo->Type, ifinfo->Name);
+		if(iface == NULL)	LEAVE_RET('i', -1);
+
+		tmp = iface->Node.ImplInt;
 		LEAVE_RET('i', tmp);
+		}
 	}
 	LEAVE('i', 0);
 	return 0;
@@ -189,40 +198,60 @@ int IPStack_Root_IOCtl(tVFS_Node *Node, int ID, void *Data)
  * \fn tInterface *IPStack_AddInterface(char *Device)
  * \brief Adds an interface to the list
  */
-tInterface *IPStack_AddInterface(const char *Device, const char *Name)
+tInterface *IPStack_AddInterface(const char *Device, int Type, const char *Name)
 {
 	tInterface	*iface;
 	tAdapter	*card;
-	 int	nameLen;
+	 int	nameLen, addrsize;
 	
 	ENTER("sDevice", Device);
 	
+	// Check address type
+	addrsize = IPStack_GetAddressSize(Type);
+	if( addrsize == -1 ) {
+		Log_Debug("IPStack", "Bad address type %i", Type);
+		return NULL;
+	}
+
+	// Open card
 	card = Adapter_GetByName(Device);
 	if( !card ) {
 		Log_Debug("IPStack", "Unable to open card '%s'", Device);
 		LEAVE('n');
 		return NULL;	// ERR_YOURBAD
 	}
-	
-	nameLen = sprintf(NULL, "%i", giIP_NextIfaceId);
-	
+
+	// Get name length	
+	if( Name[0] )
+	{
+		nameLen = strlen(Name);
+	}
+	else
+	{
+		nameLen = snprintf(NULL, 0, "%i", giIP_NextIfaceId);
+	}
+
 	iface = malloc(
 		sizeof(tInterface)
 		+ nameLen + 1
-		+ IPStack_GetAddressSize(-1)*3	// Address, Route->Network, Route->NextHop
+		+ addrsize*3	// Address, Route->Network, Route->NextHop
 		);
 	if(!iface) {
 		Log_Warning("IPStack", "AddInterface - malloc() failed");
+		// TODO: Close card
 		LEAVE('n');
 		return NULL;	// Return ERR_MYBAD
 	}
 	
 	iface->Next = NULL;
-	iface->Type = 0;	// Unset type
+	iface->Type = Type;	// Unset type
 	iface->Address = iface->Name + nameLen + 1;	// Address
+	memset(iface->Address, 0, addrsize);
 	memset(&iface->Route, 0, sizeof(iface->Route));
-	iface->Route.Network = iface->Address + IPStack_GetAddressSize(-1);
-	iface->Route.NextHop = iface->Route.Network + IPStack_GetAddressSize(-1);
+	iface->Route.Network = iface->Address + addrsize;
+	memset(iface->Route.Network, 0, addrsize);
+	iface->Route.NextHop = iface->Route.Network + addrsize;
+	memset(iface->Route.NextHop, 0, addrsize);
 	
 	// Create Node
 	iface->Node.ImplPtr = iface;
@@ -238,10 +267,19 @@ tInterface *IPStack_AddInterface(const char *Device, const char *Name)
 	// Get adapter handle
 	iface->Adapter = card;
 	
-	// Delay setting ImplInt until after the adapter is opened
-	// Keeps things simple
-	iface->Node.ImplInt = giIP_NextIfaceId++;
-	sprintf(iface->Name, "%i", (int)iface->Node.ImplInt);
+	// Set name
+	if( Name[0] )
+	{
+		iface->Node.ImplInt = 0;
+		strcpy(iface->Name, Name);
+	}
+	else
+	{
+		iface->Node.ImplInt = giIP_NextIfaceId++;
+		sprintf(iface->Name, "%i", (int)iface->Node.ImplInt);
+	}
+	
+	LOG("Creating interface '%s'", iface->Name);
 	
 	// Append to list
 	SHORTLOCK( &glIP_Interfaces );
@@ -255,8 +293,6 @@ tInterface *IPStack_AddInterface(const char *Device, const char *Name)
 	}
 	SHORTREL( &glIP_Interfaces );
 
-//	gIP_DriverInfo.RootNode.Size ++;
-	
 	// Success!
 	LEAVE('p', iface);
 	return iface;
@@ -267,7 +303,7 @@ tInterface *IPStack_AddInterface(const char *Device, const char *Name)
  */
 int IPStack_AddFile(tSocketFile *File)
 {
-	Log_Log("IPStack", "Added file '%s'", File->Name);
+//	Log_Log("IPStack", "Added file '%s'", File->Name);
 	File->Next = gIP_FileTemplates;
 	gIP_FileTemplates = File;
 	return 0;
@@ -296,7 +332,7 @@ int IPStack_Iface_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX])
 /**
  * \brief Gets a named node from an interface directory
  */
-tVFS_Node *IPStack_Iface_FindDir(tVFS_Node *Node, const char *Name)
+tVFS_Node *IPStack_Iface_FindDir(tVFS_Node *Node, const char *Name, Uint Flags)
 {
 	tSocketFile	*file = gIP_FileTemplates;
 	
@@ -305,9 +341,13 @@ tVFS_Node *IPStack_Iface_FindDir(tVFS_Node *Node, const char *Name)
 	{
 		if( strcmp(file->Name, Name) == 0 )	break;
 	}
-	if(!file)	return NULL;
+	if(!file) {
+		LOG("File '%s' unknown", Name);
+		return NULL;
+	}
 	
 	// Pass the buck!
+	LOG("File '%s' calling %p", file->Init);
 	return file->Init(Node->ImplPtr);
 }
 
@@ -345,6 +385,7 @@ int IPStack_Iface_IOCtl(tVFS_Node *Node, int ID, void *Data)
 		// Set Type?
 		if( Data )
 		{
+#if 0
 			// Ok, it's set type
 			if( Threads_GetUID() != 0 ) {
 				LOG("Attempt by non-root to alter an interface (%i)", Threads_GetUID());
@@ -370,6 +411,8 @@ int IPStack_Iface_IOCtl(tVFS_Node *Node, int ID, void *Data)
 			
 			// Clear address
 			memset(iface->Address, 0, size);
+#endif
+			Log_Notice("IPStack", "Interface ioctl(settype) no longer usable");
 		}
 		LEAVE('i', iface->Type);
 		return iface->Type;