Cleanup Commit

[tpg/acess2.git] / Modules / IPStack / ipstack.h

diff --git a/Modules/IPStack/ipstack.h b/Modules/IPStack/ipstack.h
index 8c88dac..95f93c4 100644 (file)
--- a/Modules/IPStack/ipstack.h
+++ b/Modules/IPStack/ipstack.h
@@ -5,7 +5,7 @@
 #ifndef _IPSTACK_H_
 #define _IPSTACK_H_
 
-#include <common.h>
+#include <acess.h>
 #include <vfs.h>
 
 typedef union uIPv4    tIPv4;
@@ -13,27 +13,29 @@ typedef union uIPv6 tIPv6;
 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);
 
 union uIPv4 {
        Uint32  L;
        Uint8   B[4];
-};
+} __attribute__((packed));
 
 union uIPv6 {
        Uint32  L[4];
        Uint8   B[16];
-};
+} __attribute__((packed));
 
 struct sMacAddr {
        Uint8   B[6];
-};
+} __attribute__((packed));
 
 struct sInterface {
        struct sInterface       *Next;
        tVFS_Node       Node;
        tAdapter        *Adapter;
+        int    TimeoutDelay;   // Time in miliseconds before a connection times out
         int    Type;   // 0 for disabled, 4 for IPv4 and 6 for IPv6
        union {
                struct  {
@@ -59,9 +61,21 @@ struct sAdapter {
         int    NRef;
        
        tMacAddr        MacAddr;
+        int    DeviceLen;
        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))
@@ -78,6 +92,8 @@ static const tMacAddr cMAC_BROADCAST = {{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}};
 #define htonl(in)      BigEndian32(in)
 #define ntonb(v)       (v)
 #define ntohs(in)      BigEndian16(in)
-#define ntohl(in)      BigEndian16(in)
+#define ntohl(in)      BigEndian32(in)
+
+extern int     IPStack_AddFile(tSocketFile *File);
 
 #endif