Cleanups & Implementations to allow IPStack to compile
[tpg/acess2.git] / Modules / IPStack / main.c
index aaeeb9a..2a22d1e 100644 (file)
@@ -2,9 +2,13 @@
  * Acess2 IP Stack
  * - Address Resolution Protocol
  */
+#define DEBUG  0
+#define VERSION        ((0<<8)|10)
 #include "ipstack.h"
 #include <modules.h>
 #include <fs_devfs.h>
+#include <tpl_drv_common.h>
+#include <tpl_drv_network.h>
 
 // === IMPORTS ===
  int   ARP_Initialise();
  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,
@@ -26,8 +34,11 @@ tDevFS_Driver        gIP_DriverInfo = {
        .FindDir = IPStack_FindDir
        }
 };
- int   giIP_NumInterfaces;
+ int   glIP_Interfaces = 0;
 tInterface     *gIP_Interfaces = NULL;
+tInterface     *gIP_Interfaces_Last = NULL;
+ int   glIP_Adapters = 0;
+tAdapter       *gIP_Adapters = NULL;
 
 // === CODE ===
 /**
@@ -83,5 +94,166 @@ char *IPStack_ReadDir(tVFS_Node *Node, int Pos)
  */
 tVFS_Node *IPStack_FindDir(tVFS_Node *Node, char *Name)
 {
-       return NULL;
+        int    i;
+        tInterface     *iface;
+       
+       if(Name[0] != 'i' || Name[1] != 'p')    return NULL;
+       if(Name[2] < '0' || Name[2] > '9')      return NULL;
+       
+       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[3] < '0' || Name[3] > '9')      return NULL;
+       
+       i = (Name[2] - '0')*10;
+       i += Name[3] - '0';
+       
+       for( iface = gIP_Interfaces; iface && i--; iface = iface->Next ) ;
+       if(!iface)      return NULL;
+       return &iface->Node;
+}
+
+static const char *casIOCtls[] = { DRV_IOCTLNAMES, "add_interface", NULL };
+/**
+ * \brief Handles IOCtls for the IPStack root
+ */
+int IPStack_IOCtl(tVFS_Node *Node, int ID, void *Data)
+{
+       switch(ID)
+       {
+       // --- Standard IOCtls (0-3) ---
+       case DRV_IOCTL_TYPE:
+               return DRV_TYPE_MISC;
+       
+       case DRV_IOCTL_IDENT:
+               if( !CheckMem( Data, 4 ) )      return -1;
+               memcpy(Data, "IP\0\0", 4);
+               return 1;
+       
+       case DRV_IOCTL_VERSION:
+               return VERSION;
+       
+       case DRV_IOCTL_LOOKUP:
+               if( !CheckString( Data ) )      return -1;
+               return LookupString( (char**)casIOCtls, (char*)Data );
+       
+       // --- Non-Standard IOCtls ---
+       /*
+        * add_interface
+        * - Adds a new IP interface and binds it to a device
+        */
+       case 4:
+               if( !CheckString( Data ) )      return -1;
+               return IPStack_AddInterface(Data);
+       }
+       return 0;
+}
+
+// --- Internal ---
+/**
+ * \fn int IPStack_AddInterface(char *Device)
+ * \brief Adds an interface to the list
+ */
+int IPStack_AddInterface(char *Device)
+{
+       tInterface      *iface;
+       
+       iface = malloc(sizeof(tInterface));
+       if(!iface)      return -2;      // Return ERR_MYBAD
+       
+       iface->Next = NULL;
+       iface->Type = 0;        // Unset type
+       
+       // Create Node
+       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;
+       
+       // Get adapter handle
+       iface->Adapter = IPStack_GetAdapter(Device);
+       if( !iface->Adapter ) {
+               free( iface );
+               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 );
+       
+       // Success!
+       return 1;
+}
+
+/**
+ * \fn tAdapter *IPStack_GetAdapter(char *Path)
+ * \brief Gets/opens an adapter given the path
+ */
+tAdapter *IPStack_GetAdapter(char *Path)
+{
+       tAdapter        *dev;
+       
+       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 );
+                       return dev;
+               }
+       }
+       
+       // Ok, so let's open it
+       dev = malloc( sizeof(tAdapter) + strlen(Path) + 1 );
+       if(!dev) {
+               RELEASE( &glIP_Adapters );
+               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 );
+               return NULL;
+       }
+       
+       // Check that it is a network interface
+       if( VFS_IOCtl(dev->DeviceFD, 0, NULL) != DRV_TYPE_NETWORK ) {
+               Warning("IPStack_GetAdapter: '%s' is not a network interface", dev->Device);
+               VFS_Close( dev->DeviceFD );
+               free( dev );
+               RELEASE( &glIP_Adapters );
+               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 );
+       return dev;
 }

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