More work on IPStack (Also fixed Proc_SpawnWorker)
[tpg/acess2.git] / Modules / IPStack / main.c
index aaeeb9a..7f1e02f 100644 (file)
@@ -2,32 +2,47 @@
  * Acess2 IP Stack
  * - Address Resolution Protocol
  */
+#define DEBUG  0
+#define VERSION        ((0<<8)|10)
 #include "ipstack.h"
+#include "link.h"
 #include <modules.h>
 #include <fs_devfs.h>
+#include <tpl_drv_common.h>
+#include <tpl_drv_network.h>
 
 // === IMPORTS ===
- int   ARP_Initialise();
+extern int     ARP_Initialise();
+extern int     IPv4_Initialise();
 
 // === PROTOTYPES ===
  int   IPStack_Install(char **Arguments);
 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);
+ int   IPStack_AddInterface(char *Device);
+tAdapter       *IPStack_GetAdapter(char *Path);
 
 // === GLOBALS ===
-MODULE_DEFINE(0, 0x000A, IPStack, IPStack_Install, NULL);
+MODULE_DEFINE(0, VERSION, IPStack, IPStack_Install, NULL, NULL);
 tDevFS_Driver  gIP_DriverInfo = {
        NULL, "ip",
        {
+       .Size = 0,      // Number of interfaces
        .NumACLs = 1,
        .ACLs = &gVFS_ACL_EveryoneRX,
        .Flags = VFS_FFLAG_DIRECTORY,
        .ReadDir = IPStack_ReadDir,
-       .FindDir = IPStack_FindDir
+       .FindDir = IPStack_FindDir,
+       .IOCtl = IPStack_IOCtl
        }
 };
- int   giIP_NumInterfaces;
+tSpinlock      glIP_Interfaces = 0;
 tInterface     *gIP_Interfaces = NULL;
+tInterface     *gIP_Interfaces_Last = NULL;
+ int   giIP_NextIfaceId = 1;
+tSpinlock      glIP_Adapters = 0;
+tAdapter       *gIP_Adapters = NULL;
 
 // === CODE ===
 /**
@@ -40,15 +55,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;
 }
 
@@ -58,22 +79,33 @@ int IPStack_Install(char **Arguments)
 char *IPStack_ReadDir(tVFS_Node *Node, int Pos)
 {
        tInterface      *iface;
-       char    name[5] = "ip0\0\0";
+       char    name[] = "ip0\0\0\0";
+       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;
+       }
        
        // Create the name
+       Pos = iface->Node.ImplInt;
        if(Pos < 10)
                name[2] = '0' + Pos;
-       else {
+       else if(Pos < 100) {
                name[2] = '0' + Pos/10;
                name[3] = '0' + Pos%10;
        }
+       else {
+               name[2] = '0' + Pos/100;
+               name[3] = '0' + (Pos/10)%10;
+               name[4] = '0' + Pos%10;
+       }
        
-       // 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);
 }
@@ -83,5 +115,404 @@ char *IPStack_ReadDir(tVFS_Node *Node, int Pos)
  */
 tVFS_Node *IPStack_FindDir(tVFS_Node *Node, char *Name)
 {
+        int    i, num;
+       tInterface      *iface;
+       
+       ENTER("pNode sName", Node, Name);
+       
+       if(Name[0] != 'i' || Name[1] != 'p') {
+               LEAVE('n');
+               return NULL;
+       }
+       
+       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; iface = iface->Next )
+       {
+               if( iface->Node.ImplInt == num )
+               {
+                       LEAVE('p', &iface->Node);
+                       return &iface->Node;
+               }
+       }
+       LEAVE('p', NULL);
        return NULL;
 }
+
+static const char *casIOCtls_Root[] = { DRV_IOCTLNAMES, "add_interface", NULL };
+static const char *casIOCtls_Iface[] = {
+       DRV_IOCTLNAMES,
+       "getset_type",
+       "get_address", "set_address",
+       "getset_subnet",
+       "get_gateway", "set_gateway",
+       NULL
+       };
+/**
+ * \brief Handles IOCtls for the IPStack root/interfaces
+ */
+int IPStack_IOCtl(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);
+               if( Node == &gIP_DriverInfo.RootNode )
+                       tmp = LookupString( (char**)casIOCtls_Root, (char*)Data );
+               else
+                       tmp = LookupString( (char**)casIOCtls_Iface, (char*)Data );
+               LEAVE('i', tmp);
+               return tmp;
+       }
+       
+       if(Node == &gIP_DriverInfo.RootNode)
+       {
+               switch(ID)
+               {
+               /*
+                * 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;       
+       }
+       else
+       {
+               tInterface      *iface = (tInterface*)Node->ImplPtr;
+               switch(ID)
+               {
+               /*
+                * getset_type
+                * - Get/Set the interface type
+                */
+               case 4:
+                       // 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 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);
+                       }
+                       LEAVE_RET('i', 0);
+               }
+       }
+       
+       LEAVE('i', 0);
+       return 0;
+}
+
+// --- Internal ---
+/**
+ * \fn int IPStack_AddInterface(char *Device)
+ * \brief Adds an interface to the list
+ */
+int IPStack_AddInterface(char *Device)
+{
+       tInterface      *iface;
+       
+       ENTER("sDevice", Device);
+       
+       iface = malloc(sizeof(tInterface));
+       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;
+       
+       // Get adapter handle
+       iface->Adapter = IPStack_GetAdapter(Device);
+       if( !iface->Adapter ) {
+               free( iface );
+               LEAVE('i', -1);
+               return -1;      // Return ERR_YOUFAIL
+       }
+       
+       // Append to list
+       LOCK( &glIP_Interfaces );
+       if( gIP_Interfaces ) {
+               gIP_Interfaces_Last->Next = iface;
+               gIP_Interfaces_Last = iface;
+       }
+       else {
+               gIP_Interfaces = iface;
+               gIP_Interfaces_Last = iface;
+       }
+       RELEASE( &glIP_Interfaces );
+       
+       gIP_DriverInfo.RootNode.Size ++;
+       
+       // Success!
+       LEAVE('i', iface->Node.ImplInt);
+       return iface->Node.ImplInt;
+}
+
+/**
+ * \fn tAdapter *IPStack_GetAdapter(char *Path)
+ * \brief Gets/opens an adapter given the path
+ */
+tAdapter *IPStack_GetAdapter(char *Path)
+{
+       tAdapter        *dev;
+        int    tmp;
+       
+       ENTER("sPath", Path);
+       
+       LOCK( &glIP_Adapters );
+       
+       // Check if this adapter is already open
+       for( dev = gIP_Adapters; dev; dev = dev->Next )
+       {
+               if( strcmp(dev->Device, Path) == 0 ) {
+                       dev->NRef ++;
+                       RELEASE( &glIP_Adapters );
+                       LEAVE('p', dev);
+                       return dev;
+               }
+       }
+       
+       // Ok, so let's open it
+       dev = malloc( sizeof(tAdapter) + strlen(Path) + 1 );
+       if(!dev) {
+               RELEASE( &glIP_Adapters );
+               LEAVE('n');
+               return NULL;
+       }
+       
+       // Fill Structure
+       strcpy( dev->Device, Path );
+       dev->NRef = 1;
+       
+       // Open Device
+       dev->DeviceFD = VFS_Open( dev->Device, VFS_OPENFLAG_READ|VFS_OPENFLAG_WRITE );
+       if( dev->DeviceFD == -1 ) {
+               free( dev );
+               RELEASE( &glIP_Adapters );
+               LEAVE('n');
+               return NULL;
+       }
+       
+       // Check that it is a network interface
+       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;
+       }
+       
+       // Get MAC Address
+       VFS_IOCtl(dev->DeviceFD, NET_IOCTL_GETMAC, &dev->MacAddr);
+       
+       // Add to list
+       dev->Next = gIP_Adapters;
+       gIP_Adapters = dev;
+       
+       RELEASE( &glIP_Adapters );
+       
+       // Start watcher
+       Link_WatchDevice( dev );
+       
+       LEAVE('p', dev);
+       return dev;
+}

UCC git Repository :: git.ucc.asn.au