X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Fmain.c;h=6b6f8a936bb5073f50ffd1ef98e33e88342ef850;hb=07173b260d76a7e6482838c02d5deb2ead2afbb2;hp=5f34d9a1a1f3038c92340ef3dbe64d1a1f974b96;hpb=6249939b47bd8520ef4c1b8fdb8eeb11cc052d57;p=tpg%2Facess2.git diff --git a/Modules/IPStack/main.c b/Modules/IPStack/main.c index 5f34d9a1..6b6f8a93 100644 --- a/Modules/IPStack/main.c +++ b/Modules/IPStack/main.c @@ -17,17 +17,24 @@ // === 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); // === 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); +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); // === GLOBALS === MODULE_DEFINE(0, VERSION, IPStack, IPStack_Install, NULL, NULL); @@ -38,9 +45,9 @@ tDevFS_Driver gIP_DriverInfo = { .NumACLs = 1, .ACLs = &gVFS_ACL_EveryoneRX, .Flags = VFS_FFLAG_DIRECTORY, - .ReadDir = IPStack_ReadDir, - .FindDir = IPStack_FindDir, - .IOCtl = IPStack_IOCtlRoot + .ReadDir = IPStack_Root_ReadDir, + .FindDir = IPStack_Root_FindDir, + .IOCtl = IPStack_Root_IOCtl } }; tSpinlock glIP_Interfaces = 0; @@ -49,6 +56,7 @@ tInterface *gIP_Interfaces_Last = NULL; int giIP_NextIfaceId = 1; tSpinlock glIP_Adapters = 0; tAdapter *gIP_Adapters = NULL; +tSocketFile *gIP_FileTemplates; // === CODE === /** @@ -59,9 +67,14 @@ 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(); if(Arguments) { @@ -79,10 +92,21 @@ int IPStack_Install(char **Arguments) return 1; } +/** + * \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_ReadDir(tVFS_Node *Node, int Pos) +char *IPStack_Root_ReadDir(tVFS_Node *Node, int Pos) { tInterface *iface; char *name; @@ -97,26 +121,24 @@ char *IPStack_ReadDir(tVFS_Node *Node, int Pos) return NULL; } - name = malloc(6); - name[0] = 'i'; - name[1] = 'p'; + name = malloc(4); // Create the name Pos = iface->Node.ImplInt; if(Pos < 10) { - name[2] = '0' + Pos; - name[3] = '\0'; + name[0] = '0' + Pos; + name[1] = '\0'; } else if(Pos < 100) { - name[2] = '0' + Pos/10; - name[3] = '0' + Pos%10; - name[4] = '\0'; + name[0] = '0' + Pos/10; + name[1] = '0' + Pos%10; + name[2] = '\0'; } else { - name[2] = '0' + Pos/100; - name[3] = '0' + (Pos/10)%10; - name[4] = '0' + Pos%10; - name[5] = '\0'; + name[0] = '0' + Pos/100; + name[1] = '0' + (Pos/10)%10; + name[2] = '0' + Pos%10; + name[3] = '\0'; } LEAVE('s', name); @@ -127,19 +149,14 @@ char *IPStack_ReadDir(tVFS_Node *Node, int Pos) /** * \brief Get the node of an interface */ -tVFS_Node *IPStack_FindDir(tVFS_Node *Node, char *Name) +tVFS_Node *IPStack_Root_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; + i = 0; num = 0; while('0' <= Name[i] && Name[i] <= '9') { num *= 10; @@ -167,7 +184,7 @@ 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 IPStack_Root_IOCtl(tVFS_Node *Node, int ID, void *Data) { int tmp; ENTER("pNode iID pData", Node, ID, Data); @@ -180,8 +197,7 @@ int IPStack_IOCtlRoot(tVFS_Node *Node, int ID, void *Data) return DRV_TYPE_MISC; case DRV_IOCTL_IDENT: - if( !CheckMem( Data, 4 ) ) LEAVE_RET('i', -1); - memcpy(Data, "IP\0\0", 4); + tmp = ModUtil_SetIdent(Data, "IPStack"); LEAVE('i', 1); return 1; @@ -190,9 +206,7 @@ int IPStack_IOCtlRoot(tVFS_Node *Node, int ID, void *Data) return VERSION; case DRV_IOCTL_LOOKUP: - if( !CheckString( Data ) ) LEAVE_RET('i', -1); - LOG("Lookup '%s'", Data); - tmp = LookupString( (char**)casIOCtls_Root, (char*)Data ); + tmp = ModUtil_LookupString( (char**)casIOCtls_Root, (char*)Data ); LEAVE('i', tmp); return tmp; @@ -210,6 +224,44 @@ int IPStack_IOCtlRoot(tVFS_Node *Node, int ID, void *Data) return 0; } +/** + * \brief Read from an interface's directory + */ +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; + } + + if(!file) return NULL; + + 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; + + // 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; + + // Pass the buck! + return file->Init(Node->ImplPtr); +} + +/** + * \brief Names for interface IOCtl Calls + */ static const char *casIOCtls_Iface[] = { DRV_IOCTLNAMES, "getset_type", @@ -222,7 +274,7 @@ static const char *casIOCtls_Iface[] = { /** * \brief Handles IOCtls for the IPStack interfaces */ -int IPStack_IOCtl(tVFS_Node *Node, int ID, void *Data) +int IPStack_Iface_IOCtl(tVFS_Node *Node, int ID, void *Data) { int tmp; tInterface *iface = (tInterface*)Node->ImplPtr; @@ -236,8 +288,7 @@ int IPStack_IOCtl(tVFS_Node *Node, int ID, void *Data) return DRV_TYPE_MISC; case DRV_IOCTL_IDENT: - if( !CheckMem( Data, 4 ) ) LEAVE_RET('i', -1); - memcpy(Data, "IP\0\0", 4); + tmp = ModUtil_SetIdent(Data, STR(IDENT)); LEAVE('i', 1); return 1; @@ -246,9 +297,7 @@ int IPStack_IOCtl(tVFS_Node *Node, int ID, void *Data) return VERSION; case DRV_IOCTL_LOOKUP: - if( !CheckString( Data ) ) LEAVE_RET('i', -1); - LOG("Lookup '%s'", Data); - tmp = LookupString( (char**)casIOCtls_Iface, (char*)Data ); + tmp = ModUtil_LookupString( (char**)casIOCtls_Iface, (char*)Data ); LEAVE('i', tmp); return tmp; @@ -467,12 +516,12 @@ int IPStack_AddInterface(char *Device) iface->Node.ImplPtr = iface; iface->Node.ImplInt = giIP_NextIfaceId++; iface->Node.Flags = VFS_FFLAG_DIRECTORY; - iface->Node.Size = 0; + iface->Node.Size = -1; iface->Node.NumACLs = 1; iface->Node.ACLs = &gVFS_ACL_EveryoneRX; - iface->Node.ReadDir = NULL; - iface->Node.FindDir = NULL; - iface->Node.IOCtl = IPStack_IOCtl; + iface->Node.ReadDir = IPStack_Iface_ReadDir; + iface->Node.FindDir = IPStack_Iface_FindDir; + iface->Node.IOCtl = IPStack_Iface_IOCtl; // Set Defaults iface->TimeoutDelay = DEFAULT_TIMEOUT;