X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Fmain.c;h=13bc56159effbf0cb28a9700a184b53038cc7bf4;hb=ec807c5b95ffb495b9004265a8361b0c8bbd64a4;hp=7ec76899329c07c0a4d2dffa0da512883c936862;hpb=756b72155cbcec50d6117329cf3132168a8713b1;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/main.c b/Modules/IPStack/main.c
index 7ec76899..13bc5615 100644
--- a/Modules/IPStack/main.c
+++ b/Modules/IPStack/main.c
@@ -21,6 +21,8 @@ extern void	UDP_Initialise();
 extern void	TCP_Initialise();
 extern int	IPv4_Initialise();
 extern int	IPv4_Ping(tInterface *Iface, tIPv4 Addr);
+extern int	IPv6_Initialise();
+//extern int	IPv6_Ping(tInterface *Iface, tIPv6 Addr);
 
 // === PROTOTYPES ===
  int	IPStack_Install(char **Arguments);
@@ -65,9 +67,12 @@ int IPStack_Install(char **Arguments)
 {
 	 int	i = 0;
 	
-	// Install Handlers
+	// Layer 2 - Data Link Layer
 	ARP_Initialise();
+	// Layer 3 - Network Layer
 	IPv4_Initialise();
+	IPv6_Initialise();
+	// Layer 4 - Transport Layer
 	TCP_Initialise();
 	UDP_Initialise();
 	
@@ -84,7 +89,7 @@ int IPStack_Install(char **Arguments)
 	
 	DevFS_AddDevice( &gIP_DriverInfo );
 	
-	return 1;
+	return MODULE_ERR_OK;
 }
 
 /**
@@ -92,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;
@@ -117,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;
@@ -165,7 +175,7 @@ tVFS_Node *IPStack_Root_FindDir(tVFS_Node *Node, char *Name)
 	
 	for( iface = gIP_Interfaces; iface; iface = iface->Next )
 	{
-		if( iface->Node.ImplInt == num )
+		if( (int)iface->Node.ImplInt == num )
 		{
 			LEAVE('p', &iface->Node);
 			return &iface->Node;
@@ -226,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;
 	}
 	
@@ -246,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;
 	
@@ -263,6 +271,7 @@ static const char *casIOCtls_Iface[] = {
 	"get_address", "set_address",
 	"getset_subnet",
 	"get_gateway", "set_gateway",
+	"get_device",
 	"ping",
 	NULL
 	};
@@ -460,11 +469,23 @@ int IPStack_Iface_IOCtl(tVFS_Node *Node, int ID, void *Data)
 		}
 		break;
 	
+	/*
+	 * get_device
+	 * - Gets the name of the attached device
+	 */
+	case 10:
+		if( Data == NULL )
+			LEAVE_RET('i', iface->Adapter->DeviceLen);
+		if( !CheckMem( Data, iface->Adapter->DeviceLen+1 ) )
+			LEAVE_RET('i', -1);
+		strcpy( Data, iface->Adapter->Device );
+		return iface->Adapter->DeviceLen;
+	
 	/*
 	 * ping
 	 * - Send an ICMP Echo
 	 */
-	case 10:
+	case 11:
 		switch(iface->Type)
 		{
 		case 0:
@@ -495,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);
@@ -509,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;
@@ -517,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;
@@ -529,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 ) {
@@ -583,6 +614,7 @@ tAdapter *IPStack_GetAdapter(char *Path)
 	// Fill Structure
 	strcpy( dev->Device, Path );
 	dev->NRef = 1;
+	dev->DeviceLen = strlen(Path);
 	
 	// Open Device
 	dev->DeviceFD = VFS_Open( dev->Device, VFS_OPENFLAG_READ|VFS_OPENFLAG_WRITE );