#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 int IPv6_Ping(tInterface *Iface, tIPv6 Addr);
+
+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;
// === PROTOTYPES ===
int IPStack_Install(char **Arguments);
- int IPStack_IOCtlRoot(tVFS_Node *Node, int ID, void *Data);
-char *IPStack_Root_ReadDir(tVFS_Node *Node, int Pos);
-tVFS_Node *IPStack_Root_FindDir(tVFS_Node *Node, char *Name);
- int IPStack_Root_IOCtl(tVFS_Node *Node, int ID, void *Data);
- int IPStack_AddInterface(char *Device);
-tAdapter *IPStack_GetAdapter(char *Path);
-char *IPStack_Iface_ReadDir(tVFS_Node *Node, int Pos);
-tVFS_Node *IPStack_Iface_FindDir(tVFS_Node *Node, char *Name);
- int IPStack_Iface_IOCtl(tVFS_Node *Node, int ID, void *Data);
+ int IPStack_CompareAddress(int AddressType, void *Address1, void *Address2, int CheckBits);
// === GLOBALS ===
MODULE_DEFINE(0, VERSION, IPStack, IPStack_Install, NULL, NULL);
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,
.IOCtl = IPStack_Root_IOCtl
}
};
-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;
-tSocketFile *gIP_FileTemplates;
// === CODE ===
/**
{
int i = 0;
- // Layer 2 - Data Link Layer
+ // Layer 3 - Network Layer Protocols
ARP_Initialise();
- // Layer 3 - Network Layer
IPv4_Initialise();
IPv6_Initialise();
- // Layer 4 - Transport Layer
+ // Layer 4 - Transport Layer Protocols
TCP_Initialise();
UDP_Initialise();
// Parse module arguments
for( i = 0; Arguments[i]; i++ )
{
- //if(strcmp(Arguments[i], "Device") == '=') {
- //
- //}
+ // 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
+
+ // I could also define routes using <Interface>,<HexStreamNetwork>,<Bits>,<HexStreamGateway>
+ // Example: 1,00000000,0,0A000201
}
}
+ // Initialise loopback interface
+ gIP_LoopInterface.Adapter = IPStack_GetAdapter("LOOPBACK");
+
DevFS_AddDevice( &gIP_DriverInfo );
return MODULE_ERR_OK;
}
/**
- * \brief Adds a file to the socket list
- */
-int IPStack_AddFile(tSocketFile *File)
-{
- Log("IPStack_AddFile: %s", File->Name);
- File->Next = gIP_FileTemplates;
- gIP_FileTemplates = File;
- return 0;
-}
-
-/**
- * \brief Read from the IP Stack's Device Directory
- */
-char *IPStack_Root_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(4);
-
- // Create the name
- Pos = iface->Node.ImplInt;
- if(Pos < 10) {
- name[0] = '0' + Pos;
- name[1] = '\0';
- }
- else if(Pos < 100) {
- name[0] = '0' + Pos/10;
- name[1] = '0' + Pos%10;
- name[2] = '\0';
- }
- else {
- name[0] = '0' + Pos/100;
- name[1] = '0' + (Pos/10)%10;
- name[2] = '0' + Pos%10;
- name[3] = '\0';
- }
-
- LEAVE('s', name);
- // Return the pre-generated name
- return name;
-}
-
-/**
- * \brief Get the node of an interface
- */
-tVFS_Node *IPStack_Root_FindDir(tVFS_Node *Node, char *Name)
-{
- int i, num;
- tInterface *iface;
-
- ENTER("pNode sName", Node, Name);
-
- i = 0; 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 };
-/**
- * \brief Handles IOCtls for the IPStack root
+ * \brief Gets the size (in bytes) of a specified form of address
*/
-int IPStack_Root_IOCtl(tVFS_Node *Node, int ID, void *Data)
+int IPStack_GetAddressSize(int AddressType)
{
- int tmp;
- 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 -1: // -1 = maximum
+ return sizeof(tIPv6);
- case DRV_IOCTL_IDENT:
- tmp = ModUtil_SetIdent(Data, "IPStack");
- LEAVE('i', 1);
- return 1;
-
- case DRV_IOCTL_VERSION:
- LEAVE('x', VERSION);
- return VERSION;
+ case AF_NULL:
+ return 0;
- case DRV_IOCTL_LOOKUP:
- tmp = ModUtil_LookupString( (char**)casIOCtls_Root, (char*)Data );
- LEAVE('i', tmp);
- return tmp;
+ case AF_INET4:
+ return sizeof(tIPv4);
+ case AF_INET6:
+ return sizeof(tIPv6);
- /*
- * 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);
+ default:
+ return 0;
}
- LEAVE('i', 0);
- return 0;
}
/**
- * \brief Read from an interface's directory
+ * \brief Compare two IP Addresses masked by CheckBits
*/
-char *IPStack_Iface_ReadDir(tVFS_Node *Node, int Pos)
+int IPStack_CompareAddress(int AddressType, void *Address1, void *Address2, int CheckBits)
{
- tSocketFile *file = gIP_FileTemplates;
- while(Pos-- && file) {
- Log("IPStack_Iface_ReadDir: %s", file->Name);
- file = file->Next;
- }
+ int size = IPStack_GetAddressSize(AddressType);
+ Uint8 mask;
+ Uint8 *addr1 = Address1, *addr2 = Address2;
- if(!file) return NULL;
+ // Sanity check size
+ if( CheckBits < 0 ) CheckBits = 0;
+ if( CheckBits > size*8 ) CheckBits = size*8;
- return strdup(file->Name);
-}
-
-/**
- * \brief Gets a named node from an interface directory
- */
-tVFS_Node *IPStack_Iface_FindDir(tVFS_Node *Node, char *Name)
-{
- tSocketFile *file = gIP_FileTemplates;
+ // Check first bits/8 bytes
+ if( memcmp(Address1, Address2, CheckBits/8) != 0 ) return 0;
- // Get file definition
- 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;
+ // Check if the mask is a multiple of 8
+ if( CheckBits % 8 == 0 ) return 1;
- // Pass the buck!
- return file->Init(Node->ImplPtr);
-}
-
-/**
- * \brief Names for interface IOCtl Calls
- */
-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_Iface_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:
- tmp = ModUtil_SetIdent(Data, STR(IDENT));
- LEAVE('i', 1);
+ // Check last bits
+ mask = 0xFF << (8 - (CheckBits % 8));
+ if( (addr1[CheckBits/8] & mask) == (addr2[CheckBits/8] & mask) )
return 1;
- case DRV_IOCTL_VERSION:
- LEAVE('x', VERSION);
- return VERSION;
-
- case DRV_IOCTL_LOOKUP:
- tmp = ModUtil_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;
-
- /*
- * 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;
}
-
-// --- 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 = -1;
- iface->Node.NumACLs = 1;
- iface->Node.ACLs = &gVFS_ACL_EveryoneRX;
- iface->Node.ReadDir = IPStack_Iface_ReadDir;
- iface->Node.FindDir = IPStack_Iface_FindDir;
- iface->Node.IOCtl = IPStack_Iface_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
- }
-
- // 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;
-}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au