// === 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);
// === 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);
.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;
int giIP_NextIfaceId = 1;
tSpinlock glIP_Adapters = 0;
tAdapter *gIP_Adapters = NULL;
+tSocketFile *gIP_FileTemplates;
// === CODE ===
/**
// Install Handlers
ARP_Initialise();
IPv4_Initialise();
+ TCP_Initialise();
+ UDP_Initialise();
if(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;
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);
/**
* \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;
/**
* \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);
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;
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;
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",
/**
* \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;
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;
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;
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;