-BUILD_NUM = 1423
+BUILD_NUM = 1430
OBJ = main.o link.o arp.o
OBJ += ipv4.o icmp.o
OBJ += ipv6.o
-OBJ += udp.o
+OBJ += udp.o tcp.o
NAME = IPStack
-include ../Makefile.tpl
typedef struct sMacAddr tMacAddr;
typedef struct sAdapter tAdapter;
typedef struct sInterface tInterface;
+typedef struct sSocketFile tSocketFile;
typedef void (*tIPCallback)(tInterface *Interface, void *Address, int Length, void *Buffer);
char Device[];
};
+/**
+ * \brief Describes a socket file definition
+ */
+struct sSocketFile
+{
+ struct sSocketFile *Next;
+ const char *Name;
+
+ tVFS_Node *(*Init)(tInterface *Interface);
+};
+
static const tMacAddr cMAC_BROADCAST = {{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}};
#define MAC_SET(t,v) memcpy(&(t),&(v),sizeof(tMacAddr))
#define ntohs(in) BigEndian16(in)
#define ntohl(in) BigEndian32(in)
+extern int IPStack_AddFile(tSocketFile *File);
+
#endif
// === 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 ===
/**
return 1;
}
+/**
+ * \brief Adds a file to the socket list
+ */
+int IPStack_AddFile(tSocketFile *File)
+{
+ 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;
/**
* \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;
/**
* \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 0;
}
+/**
+ * \brief Read from an interface's directory
+ */
+char *IPStack_Iface_ReadDir(tVFS_Node *Node, int Pos)
+{
+ tSocketFile *file = gIP_FileTemplates;
+ while(Pos-- && file) 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;
+ }
+ 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;
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;
+ iface->Node.ReadDir = IPStack_Iface_ReadDir;
+ iface->Node.FindDir = IPStack_Iface_FindDir;
+ iface->Node.IOCtl = IPStack_Iface_IOCtl;
// Set Defaults
iface->TimeoutDelay = DEFAULT_TIMEOUT;
// === PROTOTYPES ===
void TCP_Initialise();
void *TCP_Open(tInterface *Interface, Uint16 LocalPort, void *Address, Uint16 Port);
-void TCP_GetPacket(tInterface *Interface, int Length, void *Buffer);
+void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffer);
Uint16 TCP_GetUnusedPort();
int TCP_AllocatePort(Uint16 Port);
int TCP_DeallocatePort(Uint16 Port);
+// --- Server
+tVFS_Node *TCP_Server_Init(tInterface *Interface);
+char *TCP_Server_ReadDir(tVFS_Node *Node, int Pos);
+tVFS_Node *TCP_Server_FindDir(tVFS_Node *Node, char *Name);
+ int TCP_Server_IOCtl(tVFS_Node *Node, int ID, void *Data);
+void TCP_Server_Close(tVFS_Node *Node);
+// --- Client
+tVFS_Node *TCP_Client_Init(tInterface *Interface);
+Uint64 TCP_Client_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
+Uint64 TCP_Client_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
+ int TCP_Client_IOCtl(tVFS_Node *Node, int ID, void *Data);
+void TCP_Client_Close(tVFS_Node *Node);
+
+// === TEMPLATES ===
+tSocketFile gTCP_ServerFile = {NULL, "tcps", TCP_Server_Init};
+tSocketFile gTCP_ClientFile = {NULL, "tcpc", TCP_Client_Init};
// === GLOBALS ===
int giTCP_NumHalfopen = 0;
*/
void TCP_Initialise()
{
-
+ IPStack_AddFile(&gTCP_ServerFile);
+ IPStack_AddFile(&gTCP_ClientFile);
}
/**
* \fn void *TCP_Open(tInterface *Interface, Uint16 LocalPort, void *Address, Uint16 Port)
* \brief Open a connection to another host using TCP
*/
-void *TCP_Open(tInterface *Interface, Uint16 LocalPort, void *Address, Uint16 Port)
-{
- tTCPConnection *ret = malloc( sizeof(tTCPConnection) );
-
- ret->State = TCP_ST_CLOSED;
- if(LocalPort == 0)
- ret->LocalPort = TCP_GetUnusedPort();
- else
- ret->LocalPort = LocalPort;
- ret->RemotePort = Port;
-
- ret->LocalInterface = Interface;
-
- if(Interface->Type == 6)
- ret->RemoteIP.v6 = *(tIPv6*)Address;
- else
- ret->RemoteIP.v4 = *(tIPv4*)Address;
-
+void TCP_StartConnection(tTCPConnection *Conn)
+{
// SEND PACKET
-
- return ret;
+ // Send a TCP SYN to the target to open the connection
+ return ;
}
/**
return;
}
- // Open a new connection
+ // Open a new connection (well, check that it's a SYN)
//TODO
break;
return 1;
}
+// --- Server
+tVFS_Node *TCP_Server_Init(tInterface *Interface)
+{
+ return NULL;
+}
+
+char *TCP_Server_ReadDir(tVFS_Node *Node, int Pos)
+{
+ return NULL;
+}
+
+tVFS_Node *TCP_Server_FindDir(tVFS_Node *Node, char *Name)
+{
+ return NULL;
+}
+
+int TCP_Server_IOCtl(tVFS_Node *Node, int ID, void *Data)
+{
+ return 0;
+}
+
+// --- Client
+tVFS_Node *TCP_Client_Init(tInterface *Interface)
+{
+ tTCPConnection *conn = malloc( sizeof(tTCPConnection) );
+
+ conn->State = TCP_ST_CLOSED;
+ conn->Interface = Interface;
+ conn->LocalPort = 0;
+ conn->RemotePort = 0;
+ memset( &conn->RemoteIP, 0, sizeof(conn->RemoteIP) );
+
+ conn->Node.ImplPtr = conn;
+ conn->Node.NumACLs = 1;
+ conn->Node.ACLs = &gVFS_ACL_EveryoneRW;
+ conn->Node.Read = TCP_Client_Read;
+ conn->Node.Write = TCP_Client_Write;
+ conn->Node.IOCtl = TCP_Client_IOCtl;
+ conn->Node.Close = TCP_Client_Close;
+
+ return &conn->Node;
+}
+
+Uint64 TCP_Client_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+{
+ return 0;
+}
+
+Uint64 TCP_Client_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+{
+ return 0;
+}
+
+int TCP_Client_IOCtl(tVFS_Node *Node, int ID, void *Data)
+{
+ tTCPConnection *conn = Node->ImplPtr;
+
+ switch(ID)
+ {
+ case 5: // Get/Set local port
+ if(!Data)
+ return conn->LocalPort;
+ if(conn->State != TCP_ST_CLOSED)
+ return -1;
+ if(!CheckMem(Data, sizeof(Uint16)))
+ return -1;
+
+ if(Threads_GetUID() != 0 && *(Uint16*)Data < 1024)
+ return -1;
+
+ conn->LocalPort = *(Uint16*)Data;
+ return 0;
+
+ case 6: // Get/Set remote port
+ if(!Data) return conn->RemotePort;
+ if(conn->State != TCP_ST_CLOSED) return -1;
+ if(!CheckMem(Data, sizeof(Uint16))) return -1;
+ conn->RemotePort = *(Uint16*)Data;
+ return 0;
+
+ case 7: // Set Remote IP
+ if( conn->State != TCP_ST_CLOSED )
+ return -1;
+ if( conn->Interface->Type == 4 )
+ {
+ if(!CheckMem(Data, sizeof(tIPv4))) return -1;
+ conn->RemoteIP.v4 = *(tIPv4*)Data;
+ }
+ else if( conn->Interface->Type == 6 )
+ {
+ if(!CheckMem(Data, sizeof(tIPv6))) return -1;
+ conn->RemoteIP.v6 = *(tIPv6*)Data;
+ }
+ return 0;
+
+ case 8: // Connect
+ if(conn->LocalPort == -1)
+ conn->LocalPort = TCP_GetUnusedPort();
+ if(conn->RemotePort == -1)
+ return 0;
+
+ TCP_StartConnection(conn);
+ return 1;
+ }
+
+ return 0;
+}
+
+void TCP_Client_Close(tVFS_Node *Node)
+{
+ free(Node->ImplPtr);
+}
int State;
Uint16 LocalPort;
Uint16 RemotePort;
+ tVFS_Node Node;
- tInterface *LocalInterface;
+ tInterface *Interface;
union {
tIPv4 v4;
tIPv6 v6;
// === PROTOTYPES ===
void UDP_Initialise();
void UDP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffer);
+// --- Channel
+tVFS_Node *UDP_Channel_Init(tInterface *Interface);
+Uint64 UDP_Channel_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
+Uint64 UDP_Channel_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
+ int UDP_Channel_IOCtl(tVFS_Node *Node, int ID, void *Data);
+void UDP_Channel_Close(tVFS_Node *Node);
// === GLOBALS ===
git.ucc.asn.au / tpg / acess2.git / commitdiff
UCC git Repository :: git.ucc.asn.au