Networking - Reworked route table management
[tpg/acess2.git] / Modules / IPStack / main.c
index 1a58173..d5d1ebc 100644 (file)
@@ -3,52 +3,48 @@
  * - Stack Initialisation
  */
 #define DEBUG  0
-#define VERSION        ((0<<8)|10)
+#define VERSION        VER2(0,10)
 #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 ===
 extern int     ARP_Initialise();
+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 tAdapter        *IPStack_GetAdapter(const char *Path);
+extern char    *IPStack_Root_ReadDir(tVFS_Node *Node, int Pos);
+extern tVFS_Node       *IPStack_Root_FindDir(tVFS_Node *Node, const char *Name);
+extern int     IPStack_Root_IOCtl(tVFS_Node *Node, int ID, void *Data);
+extern tInterface      gIP_LoopInterface;
+extern tInterface      *IPStack_AddInterface(const char *Device, const char *Name);
+extern tRoute  *IPStack_AddRoute(const char *Interface, void *Network, int SubnetBits, void *NextHop, int Metric);
 
 // === 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);
- int   IPStack_AddInterface(char *Device);
-tAdapter       *IPStack_GetAdapter(char *Path);
+ int   IPStack_CompareAddress(int AddressType, const void *Address1, const void *Address2, int CheckBits);
 
 // === GLOBALS ===
 MODULE_DEFINE(0, VERSION, IPStack, IPStack_Install, NULL, NULL);
+tVFS_NodeType  gIP_RootNodeType = {
+       .ReadDir = IPStack_Root_ReadDir,
+       .FindDir = IPStack_Root_FindDir,
+       .IOCtl = IPStack_Root_IOCtl
+};
 tDevFS_Driver  gIP_DriverInfo = {
        NULL, "ip",
        {
-       .Size = 0,      // Number of interfaces
+       .Size = -1,     // Number of interfaces
        .NumACLs = 1,
        .ACLs = &gVFS_ACL_EveryoneRX,
        .Flags = VFS_FFLAG_DIRECTORY,
-       .ReadDir = IPStack_ReadDir,
-       .FindDir = IPStack_FindDir,
-       .IOCtl = IPStack_IOCtlRoot
+       .Type = &gIP_RootNodeType
        }
 };
-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 ===
 /**
@@ -59,526 +55,224 @@ int IPStack_Install(char **Arguments)
 {
         int    i = 0;
        
-       // Install Handlers
+       // Layer 3 - Network Layer Protocols
        ARP_Initialise();
        IPv4_Initialise();
+       IPv6_Initialise();
+       // Layer 4 - Transport Layer Protocols
+       TCP_Initialise();
+       UDP_Initialise();
        
        if(Arguments)
        {
                // Parse module arguments
                for( i = 0; Arguments[i]; i++ )
                {
-                       //if(strcmp(Arguments[i], "Device") == '=') {
-                       //      
-                       //}
-               }
-       }
-       
-       DevFS_AddDevice( &gIP_DriverInfo );
-       
-       return 1;
-}
-
-/**
- * \brief Read from the IP Stack's Device Directory
- */
-char *IPStack_ReadDir(tVFS_Node *Node, int Pos)
-{
-       tInterface      *iface;
-       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
-       Pos = iface->Node.ImplInt;
-       if(Pos < 10) {
-               name[2] = '0' + Pos;
-               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';
-       }
-       
-       LEAVE('s', name);
-       // Return the pre-generated name
-       return name;
-}
+                       // TODO:
+                       // Define interfaces by <Device>:<Type>:<HexStreamAddress>:<Bits>
+                       // Where:
+                       // - <Device> is the device path (E.g. /Devices/ne2k/0)
+                       // - <Type> is a number (e.g. 4) or symbol (e.g. AF_INET4)
+                       // - <HexStreamAddress> is a condensed hexadecimal stream (in big endian)
+                       //      (E.g. 0A000201 for 10.0.2.1 IPv4)
+                       // - <Bits> is the number of subnet bits (E.g. 24 for an IPv4 Class C)
+                       // Example: /Devices/ne2k/0:4:0A00020A:24
+                       //  would define an interface with the address 10.0.2.10/24
+                       if( Arguments[i][0] == '/' ) {
+                               // Define Interface
+                               char    *dev, *type, *addr, *bits;
+                               
+                               // Read definition
+                               dev = Arguments[i];
+                               type = strchr(dev, ':');
+                               if( !type ) {
+                                       Log_Warning("IPStack", "<Device>:<Type>:<HexStreamAddress>:<Bits>");
+                                       continue;
+                               }
+                               *type = '\0';   type ++;
+                               
+                               addr = strchr(type, ':');
+                               if( !addr ) {
+                                       Log_Warning("IPStack", "<Device>:<Type>:<HexStreamAddress>:<Bits>");
+                                       continue;
+                               }
+                               *addr = '\0';   addr ++;
+                               
+                               bits = strchr(addr, ':');
+                               if( !bits ) {
+                                       Log_Warning("IPStack", "<Device>:<Type>:<HexStreamAddress>:<Bits>");
+                                       continue;
+                               }
+                               *bits = '\0';   bits ++;
+                               
+                               // Define interface
+                               {
+                                        int    iType = atoi(type);
+                                        int    size = IPStack_GetAddressSize(iType);
+                                       Uint8   addrData[size];
+                                        int    iBits = atoi(bits);
+                                       
+                                       UnHex(addrData, size, addr);
+                                       
+                                       tInterface      *iface = IPStack_AddInterface(dev, "");
+                                       if( !iface ) {
+                                               Log_Warning("IPStack", "Unable to add interface on '%s'", dev);
+                                               continue ;
+                                       }
+                                       iface->Type = iType;
+                                       memcpy(iface->Address, addrData, size);
+                                       iface->SubnetBits = iBits;
+                                       
+                                       // Route for addrData/iBits, no next hop, default metric
+                                       IPStack_AddRoute(iface->Name, iface->Address, iBits, NULL, 0);
 
-/**
- * \brief Get the node of an interface
- */
-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;
+                                       Log_Notice("IPStack", "Boot interface %s/%i on %s",
+                                               IPStack_PrintAddress(iType, addrData), iBits,
+                                               dev);
+                               }
+                               
+                               continue;
+                       }
+                       
+                       // I could also define routes using <Interface>:<HexStreamNetwork>:<Bits>[:<HexStreamGateway>]
+                       // Example: 1:00000000:0:0A000201
+                       if( '0' <= Arguments[i][0] && Arguments[i][0] <= '9' )
+                       {
+                               // Define Interface
+                               char    *ifaceName, *network, *bits, *gateway;
+                               
+                               // Read definition
+                               ifaceName = Arguments[i];
+                               
+                               network = strchr(ifaceName, ':');
+                               if( !network ) {
+                                       Log_Warning("IPStack", "<iface>:<HexStreamNetwork>:<Bits>:<HexStreamGateway>");
+                                       continue;
+                               }
+                               *network = '\0';        network ++;
+                               
+                               bits = strchr(network, ':');
+                               if( !bits ) {
+                                       Log_Warning("IPStack", "<Device>:<Type>:<HexStreamAddress>:<Bits>");
+                                       continue;
+                               }
+                               *bits = '\0';   bits ++;
+                               
+                               gateway = strchr(bits, ':');
+                               if( gateway ) {
+                                       *gateway = '\0';        gateway ++;
+                               }
+                               
+                               // Define route
+                               {
+                                       tVFS_Node       *node = IPStack_Root_FindDir(NULL, ifaceName);
+                                       if( !node ) {
+                                               Log_Warning("IPStack", "Unknown interface '%s' in arg %i", ifaceName, i);
+                                               continue ;
+                                       }
+                                       tInterface      *iface = node->ImplPtr;
+                                       
+                                        int    size = IPStack_GetAddressSize(iface->Type);
+                                       Uint8   netData[size];
+                                       Uint8   gwData[size];
+                                        int    iBits = atoi(bits);
+                                       
+                                       UnHex(netData, size, network);
+                                       if( gateway )
+                                               UnHex(gwData, size, gateway);
+                                       else
+                                               memset(gwData, 0, size);
+                                       
+                                       IPStack_AddRoute(ifaceName, netData, iBits, gwData, 30);
+                               }
+                               
+                               continue;
+                       }
                }
        }
-       LEAVE('p', NULL);
-       return 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;
+       // Initialise loopback interface
+       gIP_LoopInterface.Adapter = IPStack_GetAdapter("LOOPBACK");
        
-       case DRV_IOCTL_VERSION:
-               LEAVE('x', VERSION);
-               return VERSION;
+       DevFS_AddDevice( &gIP_DriverInfo );
        
-       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;
-               
-               /*
-                * 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;
+       return MODULE_ERR_OK;
 }
 
-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
+ * \brief Gets the size (in bytes) of a specified form of address
  */
-int IPStack_IOCtl(tVFS_Node *Node, int ID, void *Data)
+int IPStack_GetAddressSize(int AddressType)
 {
-        int    tmp;
-       tInterface      *iface = (tInterface*)Node->ImplPtr;
-       ENTER("pNode iID pData", Node, ID, Data);
-       
-       switch(ID)
+       switch(AddressType)
        {
-       // --- 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;
-       
-       /*
-        * 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;
+       case -1:        // -1 = maximum
+               return sizeof(tIPv6);
        
-       /*
-        * 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);
+       case AF_NULL:
                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 AF_INET4:
+               return sizeof(tIPv4);
+       case AF_INET6:
+               return sizeof(tIPv6);
                
-               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;
-       
+       default:
+               return 0;
        }
-       
-       LEAVE('i', 0);
-       return 0;
 }
 
-// --- Internal ---
 /**
- * \fn int IPStack_AddInterface(char *Device)
- * \brief Adds an interface to the list
+ * \brief Compare two IP Addresses masked by CheckBits
  */
-int IPStack_AddInterface(char *Device)
+int IPStack_CompareAddress(int AddressType, const void *Address1, const void *Address2, int CheckBits)
 {
-       tInterface      *iface;
-       
-       ENTER("sDevice", Device);
+        int    size = IPStack_GetAddressSize(AddressType);
+       Uint8   mask;
+       const Uint8     *addr1 = Address1, *addr2 = Address2;
        
-       iface = malloc(sizeof(tInterface));
-       if(!iface) {
-               LEAVE('i', -2);
-               return -2;      // Return ERR_MYBAD
-       }
+       // Sanity check size
+       if( CheckBits < 0 )     CheckBits = size*8;
+       if( CheckBits > size*8 )        CheckBits = size*8;
        
-       iface->Next = NULL;
-       iface->Type = 0;        // Unset type
+       if( CheckBits == 0 )    return 1;       // /0 matches anything
        
-       // 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;
+       // Check first bits/8 bytes
+       if( memcmp(Address1, Address2, CheckBits/8) != 0 )      return 0;
        
-       // Set Defaults
-       iface->TimeoutDelay = DEFAULT_TIMEOUT;
+       // Check if the mask is a multiple of 8
+       if( CheckBits % 8 == 0 )        return 1;
        
-       // 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 ++;
+       // Check last bits
+       mask = 0xFF << (8 - (CheckBits % 8));
+       if( (addr1[CheckBits/8] & mask) == (addr2[CheckBits/8] & mask) )
+               return 1;
        
-       // Success!
-       LEAVE('i', iface->Node.ImplInt);
-       return iface->Node.ImplInt;
+       return 0;
 }
 
-/**
- * \fn tAdapter *IPStack_GetAdapter(char *Path)
- * \brief Gets/opens an adapter given the path
- */
-tAdapter *IPStack_GetAdapter(char *Path)
+const char *IPStack_PrintAddress(int AddressType, const void *Address)
 {
-       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 )
+       switch( AddressType )
        {
-               if( strcmp(dev->Device, Path) == 0 ) {
-                       dev->NRef ++;
-                       RELEASE( &glIP_Adapters );
-                       LEAVE('p', dev);
-                       return dev;
+       case 4: {
+               static char     ret[4*3+3+1];
+               const Uint8     *addr = Address;
+               sprintf(ret, "%i.%i.%i.%i", addr[0], addr[1], addr[2], addr[3]);
+               return ret;
                }
-       }
-       
-       // 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;
-       }
+       case 6: {       // TODO: address compression
+               static char     ret[8*4+7+1];
+               const Uint16    *addr = Address;
+               sprintf(ret, "%x:%x:%x:%x:%x:%x:%x:%x",
+                       ntohs(addr[0]), ntohs(addr[1]), ntohs(addr[2]), ntohs(addr[3]),
+                       ntohs(addr[4]), ntohs(addr[5]), ntohs(addr[6]), ntohs(addr[7])
+                       );
+               return ret;
+               }
        
-       // 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;
+       default:
+               return "";
        }
-       
-       // 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