X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Fmain.c;h=831000a4b6c85cea707abf3f4a00b6098169ed83;hb=56b770130dc830c6a9dccb6c50e6442a8bdb0b6c;hp=2a22d1e011b711c051079bba415b9e2b9d76c296;hpb=04b368645c34cc3853fc13f93e33ac7878be8479;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/main.c b/Modules/IPStack/main.c
index 2a22d1e0..831000a4 100644
--- a/Modules/IPStack/main.c
+++ b/Modules/IPStack/main.c
@@ -1,20 +1,28 @@
 /*
  * Acess2 IP Stack
- * - Address Resolution Protocol
+ * - Stack Initialisation
  */
 #define DEBUG	0
-#define VERSION	((0<<8)|10)
+#define VERSION	VER3(0,10,0)
 #include "ipstack.h"
+#include "link.h"
 #include <modules.h>
 #include <fs_devfs.h>
 #include <tpl_drv_common.h>
 #include <tpl_drv_network.h>
 
+// === CONSTANTS ===
+//! Default timeout value, 30 seconds
+#define DEFAULT_TIMEOUT	(30*1000)
+
 // === IMPORTS ===
- int	ARP_Initialise();
+extern int	ARP_Initialise();
+extern int	IPv4_Initialise();
+extern int	IPv4_Ping(tInterface *Iface, tIPv4 Addr);
 
 // === PROTOTYPES ===
  int	IPStack_Install(char **Arguments);
+ int	IPStack_IOCtlRoot(tVFS_Node *Node, int ID, void *Data);
 char	*IPStack_ReadDir(tVFS_Node *Node, int Pos);
 tVFS_Node	*IPStack_FindDir(tVFS_Node *Node, char *Name);
  int	IPStack_IOCtl(tVFS_Node *Node, int ID, void *Data);
@@ -31,13 +39,15 @@ tDevFS_Driver	gIP_DriverInfo = {
 	.ACLs = &gVFS_ACL_EveryoneRX,
 	.Flags = VFS_FFLAG_DIRECTORY,
 	.ReadDir = IPStack_ReadDir,
-	.FindDir = IPStack_FindDir
+	.FindDir = IPStack_FindDir,
+	.IOCtl = IPStack_IOCtlRoot
 	}
 };
- int	glIP_Interfaces = 0;
+tSpinlock	glIP_Interfaces = 0;
 tInterface	*gIP_Interfaces = NULL;
 tInterface	*gIP_Interfaces_Last = NULL;
- int	glIP_Adapters = 0;
+ int	giIP_NextIfaceId = 1;
+tSpinlock	glIP_Adapters = 0;
 tAdapter	*gIP_Adapters = NULL;
 
 // === CODE ===
@@ -51,15 +61,21 @@ int IPStack_Install(char **Arguments)
 	
 	// Install Handlers
 	ARP_Initialise();
+	IPv4_Initialise();
 	
-	// Parse module arguments
-	for( i = 0; Arguments[i]; i++ )
+	if(Arguments)
 	{
-		//if(strcmp(Arguments[i], "Device") == '=') {
-		//	
-		//}
+		// Parse module arguments
+		for( i = 0; Arguments[i]; i++ )
+		{
+			//if(strcmp(Arguments[i], "Device") == '=') {
+			//	
+			//}
+		}
 	}
 	
+	DevFS_AddDevice( &gIP_DriverInfo );
+	
 	return 1;
 }
 
@@ -69,24 +85,43 @@ int IPStack_Install(char **Arguments)
 char *IPStack_ReadDir(tVFS_Node *Node, int Pos)
 {
 	tInterface	*iface;
-	char	name[5] = "ip0\0\0";
+	char	*name;
+	ENTER("pNode iPos", Node, Pos);
+	
+	// Traverse the list
+	for( iface = gIP_Interfaces; iface && Pos--; iface = iface->Next ) ;
+	
+	// Did we run off the end?
+	if(!iface) {
+		LEAVE('n');
+		return NULL;
+	}
+	
+	name = malloc(6);
+	name[0] = 'i';
+	name[1] = 'p';
 	
 	// Create the name
-	if(Pos < 10)
+	Pos = iface->Node.ImplInt;
+	if(Pos < 10) {
 		name[2] = '0' + Pos;
-	else {
+		name[3] = '\0';
+	}
+	else if(Pos < 100) {
 		name[2] = '0' + Pos/10;
 		name[3] = '0' + Pos%10;
+		name[4] = '\0';
+	}
+	else {
+		name[2] = '0' + Pos/100;
+		name[3] = '0' + (Pos/10)%10;
+		name[4] = '0' + Pos%10;
+		name[5] = '\0';
 	}
 	
-	// Traverse the list
-	for( iface = gIP_Interfaces; iface && Pos--; iface = iface->Next ) ;
-	
-	// Did we run off the end?
-	if(!iface)	return NULL;
-	
+	LEAVE('s', name);
 	// Return the pre-generated name
-	return strdup(name);
+	return name;
 }
 
 /**
@@ -94,62 +129,317 @@ char *IPStack_ReadDir(tVFS_Node *Node, int Pos)
  */
 tVFS_Node *IPStack_FindDir(tVFS_Node *Node, char *Name)
 {
-	 int	i;
-	 tInterface	*iface;
+	 int	i, num;
+	tInterface	*iface;
 	
-	if(Name[0] != 'i' || Name[1] != 'p')	return NULL;
-	if(Name[2] < '0' || Name[2] > '9')	return NULL;
+	ENTER("pNode sName", Node, Name);
 	
-	if(Name[3] == '\0') {
-		i = Name[2] - '0';
-		for( iface = gIP_Interfaces; iface && i--; iface = iface->Next ) ;
-		if(!iface)	return NULL;
-		return &iface->Node;
+	if(Name[0] != 'i' || Name[1] != 'p') {
+		LEAVE('n');
+		return NULL;
 	}
 	
-	if(Name[3] < '0' || Name[3] > '9')	return NULL;
-	
-	i = (Name[2] - '0')*10;
-	i += Name[3] - '0';
+	i = 2;	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 && i--; iface = iface->Next ) ;
-	if(!iface)	return NULL;
-	return &iface->Node;
+	for( iface = gIP_Interfaces; iface; iface = iface->Next )
+	{
+		if( iface->Node.ImplInt == num )
+		{
+			LEAVE('p', &iface->Node);
+			return &iface->Node;
+		}
+	}
+	LEAVE('p', NULL);
+	return NULL;
 }
 
-static const char *casIOCtls[] = { DRV_IOCTLNAMES, "add_interface", NULL };
+static const char *casIOCtls_Root[] = { DRV_IOCTLNAMES, "add_interface", NULL };
 /**
  * \brief Handles IOCtls for the IPStack root
  */
+int IPStack_IOCtlRoot(tVFS_Node *Node, int ID, void *Data)
+{
+	 int	tmp;
+	ENTER("pNode iID pData", Node, ID, Data);
+	
+	switch(ID)
+	{
+	// --- Standard IOCtls (0-3) ---
+	case DRV_IOCTL_TYPE:
+		LEAVE('i', DRV_TYPE_MISC);
+		return DRV_TYPE_MISC;
+	
+	case DRV_IOCTL_IDENT:
+		if( !CheckMem( Data, 4 ) )	LEAVE_RET('i', -1);
+		memcpy(Data, "IP\0\0", 4);
+		LEAVE('i', 1);
+		return 1;
+	
+	case DRV_IOCTL_VERSION:
+		LEAVE('x', VERSION);
+		return VERSION;
+	
+	case DRV_IOCTL_LOOKUP:
+		if( !CheckString( Data ) )	LEAVE_RET('i', -1);
+		LOG("Lookup '%s'", Data);
+		tmp = LookupString( (char**)casIOCtls_Root, (char*)Data );
+		LEAVE('i', tmp);
+		return tmp;
+		
+		/*
+		 * add_interface
+		 * - Adds a new IP interface and binds it to a device
+		 */
+	case 4:
+		if( Threads_GetUID() != 0 )	LEAVE_RET('i', -1);
+		if( !CheckString( Data ) )	LEAVE_RET('i', -1);
+		tmp = IPStack_AddInterface(Data);
+		LEAVE_RET('i', tmp);
+	}
+	LEAVE('i', 0);
+	return 0;
+}
+
+static const char *casIOCtls_Iface[] = {
+	DRV_IOCTLNAMES,
+	"getset_type",
+	"get_address", "set_address",
+	"getset_subnet",
+	"get_gateway", "set_gateway",
+	"ping",
+	NULL
+	};
+/**
+ * \brief Handles IOCtls for the IPStack interfaces
+ */
 int IPStack_IOCtl(tVFS_Node *Node, int ID, void *Data)
 {
+	 int	tmp;
+	tInterface	*iface = (tInterface*)Node->ImplPtr;
+	ENTER("pNode iID pData", Node, ID, Data);
+	
 	switch(ID)
 	{
 	// --- Standard IOCtls (0-3) ---
 	case DRV_IOCTL_TYPE:
+		LEAVE('i', DRV_TYPE_MISC);
 		return DRV_TYPE_MISC;
 	
 	case DRV_IOCTL_IDENT:
-		if( !CheckMem( Data, 4 ) )	return -1;
+		if( !CheckMem( Data, 4 ) )	LEAVE_RET('i', -1);
 		memcpy(Data, "IP\0\0", 4);
+		LEAVE('i', 1);
 		return 1;
 	
 	case DRV_IOCTL_VERSION:
+		LEAVE('x', VERSION);
 		return VERSION;
 	
 	case DRV_IOCTL_LOOKUP:
-		if( !CheckString( Data ) )	return -1;
-		return LookupString( (char**)casIOCtls, (char*)Data );
+		if( !CheckString( Data ) )	LEAVE_RET('i', -1);
+		LOG("Lookup '%s'", Data);
+		tmp = LookupString( (char**)casIOCtls_Iface, (char*)Data );
+		LEAVE('i', tmp);
+		return tmp;
 	
-	// --- Non-Standard IOCtls ---
 	/*
-	 * add_interface
-	 * - Adds a new IP interface and binds it to a device
+	 * getset_type
+	 * - Get/Set the interface type
 	 */
 	case 4:
-		if( !CheckString( Data ) )	return -1;
-		return IPStack_AddInterface(Data);
+		// Set Type?
+		if( Data )
+		{
+			// Ok, it's set type
+			if( Threads_GetUID() != 0 ) {
+				LOG("Attempt by non-root to alter an interface (%i)", Threads_GetUID());
+				LEAVE('i', -1);
+				return -1;
+			}
+			if( !CheckMem( Data, sizeof(int) ) ) {
+				LOG("Invalid pointer %p", Data);
+				LEAVE('i', -1);
+				return -1;
+			}
+			switch( *(int*)Data )
+			{
+			case 0:	// Disable
+				iface->Type = 0;
+				memset(&iface->IP6, 0, sizeof(tIPv6));	// Clear address
+				break;
+			case 4:	// IPv4
+				iface->Type = 4;
+				memset(&iface->IP4, 0, sizeof(tIPv4));
+				break;
+			case 6:	// IPv6
+				iface->Type = 6;
+				memset(&iface->IP6, 0, sizeof(tIPv6));
+				break;
+			default:
+				LEAVE('i', -1);
+				return -1;
+			}
+		}
+		LEAVE('i', iface->Type);
+		return iface->Type;
+	
+	/*
+	 * get_address
+	 * - Get the interface's address
+	 */
+	case 5:
+		switch(iface->Type)
+		{
+		case 0:	LEAVE_RET('i', 1);
+		case 4:
+			if( !CheckMem( Data, sizeof(tIPv4) ) )	LEAVE_RET('i', -1);
+			memcpy( Data, &iface->IP4.Address, sizeof(tIPv4) );
+			LEAVE_RET('i', 1);
+		case 6:
+			if( !CheckMem( Data, sizeof(tIPv6) ) )	LEAVE_RET('i', -1);
+			memcpy( Data, &iface->IP6.Address, sizeof(tIPv6) );
+			LEAVE_RET('i', 1);
+		}
+		LEAVE_RET('i', 0);
+	
+	/*
+	 * set_address
+	 * - Get the interface's address
+	 */
+	case 6:
+		if( Threads_GetUID() != 0 )	LEAVE_RET('i', -1);
+		switch(iface->Type)
+		{
+		case 0:	LEAVE_RET('i', 1);
+		case 4:
+			if( !CheckMem( Data, sizeof(tIPv4) ) )	LEAVE_RET('i', -1);
+			iface->Type = 0;	// One very hacky mutex/trash protector
+			memcpy( &iface->IP4.Address, Data, sizeof(tIPv4) );
+			iface->Type = 4;
+			LEAVE_RET('i', 1);
+		case 6:
+			if( !CheckMem( Data, sizeof(tIPv6) ) )	LEAVE_RET('i', -1);
+			iface->Type = 0;
+			memcpy( &iface->IP6.Address, Data, sizeof(tIPv6) );
+			iface->Type = 6;
+			LEAVE_RET('i', 1);
+		}
+		LEAVE_RET('i', 0);
+	
+	/*
+	 * getset_subnet
+	 * - Get/Set the bits in the address subnet
+	 */
+	case 7:
+		// Get?
+		if( Data == NULL )
+		{
+			switch( iface->Type )
+			{
+			case 4:		LEAVE_RET('i', iface->IP4.SubnetBits);
+			case 6:		LEAVE_RET('i', iface->IP6.SubnetBits);
+			default:	LEAVE_RET('i', 0);
+			}
+		}
+		
+		// Ok, set.
+		if( Threads_GetUID() != 0 )	LEAVE_RET('i', -1);
+		if( !CheckMem(Data, sizeof(int)) )	LEAVE_RET('i', -1);
+		
+		// Check and set the subnet bits
+		switch( iface->Type )
+		{
+		case 4:
+			if( *(int*)Data < 0 || *(int*)Data > 31 )	LEAVE_RET('i', -1);
+			iface->IP4.SubnetBits = *(int*)Data;
+			LEAVE_RET('i', iface->IP4.SubnetBits);
+		case 6:
+			if( *(int*)Data < 0 || *(int*)Data > 127 )	LEAVE_RET('i', -1);
+			iface->IP6.SubnetBits = *(int*)Data;
+			LEAVE_RET('i', iface->IP6.SubnetBits);
+		default:
+			break;
+		}
+		
+		LEAVE('i', 0);
+		return 0;
+		
+	/*
+	 * get_gateway
+	 * - Get the interface's IPv4 gateway
+	 */
+	case 8:
+		switch(iface->Type)
+		{
+		case 0:
+			LEAVE_RET('i', 1);
+		case 4:
+			if( !CheckMem( Data, sizeof(tIPv4) ) )	LEAVE_RET('i', -1);
+			memcpy( Data, &iface->IP4.Gateway, sizeof(tIPv4) );
+			LEAVE_RET('i', 1);
+		case 6:
+			LEAVE_RET('i', 1);
+		}
+		LEAVE('i', 0);
+		return 0;
+	
+	/*
+	 * set_gateway
+	 * - Get/Set the interface's IPv4 gateway
+	 */
+	case 9:
+		if( Threads_GetUID() != 0 )	LEAVE_RET('i', -1);
+		switch(iface->Type)
+		{
+		case 0:
+			LEAVE_RET('i', 1);
+		
+		case 4:
+			if( !CheckMem( Data, sizeof(tIPv4) ) )	LEAVE_RET('i', -1);
+			iface->Type = 0;	// One very hacky mutex/trash protector
+			memcpy( &iface->IP4.Gateway, Data, sizeof(tIPv4) );
+			iface->Type = 4;
+			LEAVE_RET('i', 1);
+			
+		case 6:
+			LEAVE_RET('i', 1);
+		}
+		break;
+	
+	/*
+	 * ping
+	 * - Send an ICMP Echo
+	 */
+	case 10:
+		switch(iface->Type)
+		{
+		case 0:
+			LEAVE_RET('i', 1);
+		
+		case 4:
+			if( !CheckMem( Data, sizeof(tIPv4) ) )	LEAVE_RET('i', -1);
+			tmp = IPv4_Ping(iface, *(tIPv4*)Data);
+			LEAVE('i', tmp);
+			return tmp;
+			
+		case 6:
+			LEAVE_RET('i', 1);
+		}
+		break;
+	
 	}
+	
+	LEAVE('i', 0);
 	return 0;
 }
 
@@ -162,24 +452,36 @@ int IPStack_AddInterface(char *Device)
 {
 	tInterface	*iface;
 	
+	ENTER("sDevice", Device);
+	
 	iface = malloc(sizeof(tInterface));
-	if(!iface)	return -2;	// Return ERR_MYBAD
+	if(!iface) {
+		LEAVE('i', -2);
+		return -2;	// Return ERR_MYBAD
+	}
 	
 	iface->Next = NULL;
 	iface->Type = 0;	// Unset type
 	
 	// Create Node
+	iface->Node.ImplPtr = iface;
+	iface->Node.ImplInt = giIP_NextIfaceId++;
 	iface->Node.Flags = VFS_FFLAG_DIRECTORY;
 	iface->Node.Size = 0;
 	iface->Node.NumACLs = 1;
 	iface->Node.ACLs = &gVFS_ACL_EveryoneRX;
 	iface->Node.ReadDir = NULL;
 	iface->Node.FindDir = NULL;
+	iface->Node.IOCtl = IPStack_IOCtl;
+	
+	// Set Defaults
+	iface->TimeoutDelay = DEFAULT_TIMEOUT;
 	
 	// Get adapter handle
 	iface->Adapter = IPStack_GetAdapter(Device);
 	if( !iface->Adapter ) {
 		free( iface );
+		LEAVE('i', -1);
 		return -1;	// Return ERR_YOUFAIL
 	}
 	
@@ -195,8 +497,11 @@ int IPStack_AddInterface(char *Device)
 	}
 	RELEASE( &glIP_Interfaces );
 	
+	gIP_DriverInfo.RootNode.Size ++;
+	
 	// Success!
-	return 1;
+	LEAVE('i', iface->Node.ImplInt);
+	return iface->Node.ImplInt;
 }
 
 /**
@@ -206,6 +511,9 @@ int IPStack_AddInterface(char *Device)
 tAdapter *IPStack_GetAdapter(char *Path)
 {
 	tAdapter	*dev;
+	 int	tmp;
+	
+	ENTER("sPath", Path);
 	
 	LOCK( &glIP_Adapters );
 	
@@ -215,6 +523,7 @@ tAdapter *IPStack_GetAdapter(char *Path)
 		if( strcmp(dev->Device, Path) == 0 ) {
 			dev->NRef ++;
 			RELEASE( &glIP_Adapters );
+			LEAVE('p', dev);
 			return dev;
 		}
 	}
@@ -223,6 +532,7 @@ tAdapter *IPStack_GetAdapter(char *Path)
 	dev = malloc( sizeof(tAdapter) + strlen(Path) + 1 );
 	if(!dev) {
 		RELEASE( &glIP_Adapters );
+		LEAVE('n');
 		return NULL;
 	}
 	
@@ -235,15 +545,19 @@ tAdapter *IPStack_GetAdapter(char *Path)
 	if( dev->DeviceFD == -1 ) {
 		free( dev );
 		RELEASE( &glIP_Adapters );
+		LEAVE('n');
 		return NULL;
 	}
 	
 	// Check that it is a network interface
-	if( VFS_IOCtl(dev->DeviceFD, 0, NULL) != DRV_TYPE_NETWORK ) {
+	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);
 		VFS_Close( dev->DeviceFD );
 		free( dev );
 		RELEASE( &glIP_Adapters );
+		LEAVE('n');
 		return NULL;
 	}
 	
@@ -255,5 +569,10 @@ tAdapter *IPStack_GetAdapter(char *Path)
 	gIP_Adapters = dev;
 	
 	RELEASE( &glIP_Adapters );
+	
+	// Start watcher
+	Link_WatchDevice( dev );
+	
+	LEAVE('p', dev);
 	return dev;
 }