#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 tVFS_Node gIP_RouteNode;
+
+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;
+extern tInterface *IPStack_AddInterface(const char *Device, const char *Name);
+extern tRoute *IPStack_AddRoute(const char *Interface, void *Network, int SubnetBits, void *NextHop, int Metric);
// === 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, const char *Name);
- int IPStack_Root_IOCtl(tVFS_Node *Node, int ID, void *Data);
-
-char *IPStack_Iface_ReadDir(tVFS_Node *Node, int Pos);
-tVFS_Node *IPStack_Iface_FindDir(tVFS_Node *Node, const char *Name);
- int IPStack_Iface_IOCtl(tVFS_Node *Node, int ID, void *Data);
-
- int IPStack_AddInterface(const char *Device, const char *Name);
-tAdapter *IPStack_GetAdapter(const char *Path);
+ int IPStack_CompareAddress(int AddressType, const void *Address1, const void *Address2, int CheckBits);
// === GLOBALS ===
MODULE_DEFINE(0, VERSION, IPStack, IPStack_Install, NULL, NULL);
+tVFS_NodeType gIP_RootNodeType = {
+ .ReadDir = IPStack_Root_ReadDir,
+ .FindDir = IPStack_Root_FindDir,
+ .IOCtl = IPStack_Root_IOCtl
+};
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,
- .ReadDir = IPStack_Root_ReadDir,
- .FindDir = IPStack_Root_FindDir,
- .IOCtl = IPStack_Root_IOCtl
+ .Type = &gIP_RootNodeType
}
};
-tShortSpinlock glIP_Interfaces;
-//! Loopback (127.0.0.0/8, ::1) Pseudo-Interface
-tInterface gIP_LoopInterface = {
- Node: {
- ImplPtr: &gIP_LoopInterface,
- Flags: VFS_FFLAG_DIRECTORY,
- Size: -1,
- NumACLs: 1,
- ACLs: &gVFS_ACL_EveryoneRX,
- ReadDir: IPStack_Iface_ReadDir,
- FindDir: IPStack_Iface_FindDir,
- IOCtl: IPStack_Iface_IOCtl
- },
- Adapter: NULL,
- Type: 0
-};
-tInterface *gIP_Interfaces = NULL;
-tInterface *gIP_Interfaces_Last = NULL;
- int giIP_NextIfaceId = 1;
-tMutex glIP_Adapters;
-tAdapter *gIP_Adapters = NULL;
-tSocketFile *gIP_FileTemplates;
// === CODE ===
/**
for( i = 0; Arguments[i]; i++ )
{
// TODO:
- // Define interfaces by <Device>,<Type>,<HexStreamAddress>,<Bits>
+ // 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
+ // would define an interface with the address 10.0.2.10/24
+ if( Arguments[i][0] == '/' ) {
+ // Define Interface
+ char *dev, *type, *addr, *bits;
+
+ // Read definition
+ dev = Arguments[i];
+ type = strchr(dev, ':');
+ if( !type ) {
+ Log_Warning("IPStack", "<Device>:<Type>:<HexStreamAddress>:<Bits>");
+ continue;
+ }
+ *type = '\0'; type ++;
+
+ addr = strchr(type, ':');
+ if( !addr ) {
+ Log_Warning("IPStack", "<Device>:<Type>:<HexStreamAddress>:<Bits>");
+ continue;
+ }
+ *addr = '\0'; addr ++;
+
+ bits = strchr(addr, ':');
+ if( !bits ) {
+ Log_Warning("IPStack", "<Device>:<Type>:<HexStreamAddress>:<Bits>");
+ continue;
+ }
+ *bits = '\0'; bits ++;
+
+ // Define interface
+ {
+ int iType = atoi(type);
+ int size = IPStack_GetAddressSize(iType);
+ Uint8 addrData[size];
+ int iBits = atoi(bits);
+
+ UnHex(addrData, size, addr);
+
+ tInterface *iface = IPStack_AddInterface(dev, "");
+ if( !iface ) {
+ Log_Warning("IPStack", "Unable to add interface on '%s'", dev);
+ continue ;
+ }
+ iface->Type = iType;
+ memcpy(iface->Address, addrData, size);
+ iface->SubnetBits = iBits;
+
+ // Route for addrData/iBits, no next hop, default metric
+ IPStack_AddRoute(iface->Name, iface->Address, iBits, NULL, 0);
+
+ Log_Notice("IPStack", "Boot interface %s/%i on %s",
+ IPStack_PrintAddress(iType, addrData), iBits,
+ dev);
+ }
+
+ continue;
+ }
+
+ // I could also define routes using <Interface>:<HexStreamNetwork>:<Bits>[:<HexStreamGateway>]
+ // Example: 1:00000000:0:0A000201
+ if( '0' <= Arguments[i][0] && Arguments[i][0] <= '9' )
+ {
+ // Define Interface
+ char *ifaceName, *network, *bits, *gateway;
+
+ // Read definition
+ ifaceName = Arguments[i];
+
+ network = strchr(ifaceName, ':');
+ if( !network ) {
+ Log_Warning("IPStack", "<iface>:<HexStreamNetwork>:<Bits>:<HexStreamGateway>");
+ continue;
+ }
+ *network = '\0'; network ++;
+
+ bits = strchr(network, ':');
+ if( !bits ) {
+ Log_Warning("IPStack", "<Device>:<Type>:<HexStreamAddress>:<Bits>");
+ continue;
+ }
+ *bits = '\0'; bits ++;
+
+ gateway = strchr(bits, ':');
+ if( gateway ) {
+ *gateway = '\0'; gateway ++;
+ }
+
+ // Define route
+ {
+ tVFS_Node *node = IPStack_Root_FindDir(NULL, ifaceName);
+ if( !node ) {
+ Log_Warning("IPStack", "Unknown interface '%s' in arg %i", ifaceName, i);
+ continue ;
+ }
+ tInterface *iface = node->ImplPtr;
+
+ int size = IPStack_GetAddressSize(iface->Type);
+ Uint8 netData[size];
+ Uint8 gwData[size];
+ int iBits = atoi(bits);
+
+ UnHex(netData, size, network);
+ if( gateway )
+ UnHex(gwData, size, gateway);
+ else
+ memset(gwData, 0, size);
+
+ IPStack_AddRoute(ifaceName, netData, iBits, gwData, 30);
+ }
+
+ continue;
+ }
}
}
- gIP_LoopInterface.Adapter = IPStack_GetAdapter("/Devices/fifo/anon");
+ // Initialise loopback interface
+ gIP_LoopInterface.Adapter = IPStack_GetAdapter("LOOPBACK");
DevFS_AddDevice( &gIP_DriverInfo );
}
/**
- * \brief Adds a file to the socket list
- */
-int IPStack_AddFile(tSocketFile *File)
-{
- Log_Log("IPStack", "Added file '%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);
-
-
- // Routing Subdir
- if( Pos == 0 ) {
- return strdup("routes");
- }
- // Pseudo Interfaces
- if( Pos == 1 ) {
- return strdup("lo");
- }
- Pos -= 2;
-
- // 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);
- if(!name) {
- Log_Warning("IPStack", "IPStack_Root_ReadDir - malloc error");
- LEAVE('n');
- return NULL;
- }
-
- // 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, const char *Name)
-{
- int i, num;
- tInterface *iface;
-
- ENTER("pNode sName", Node, Name);
-
- // Routing subdir
- if( strcmp(Name, "routes") == 0 ) {
- return &gIP_RouteNode;
- }
-
- // Loopback
- if( strcmp(Name, "lo") == 0 ) {
- return &gIP_LoopInterface.Node;
- }
-
- 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( (int)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 DRV_IOCTL_IDENT:
- tmp = ModUtil_SetIdent(Data, "IPStack");
- LEAVE('i', 1);
- return 1;
+ case -1: // -1 = maximum
+ return sizeof(tIPv6);
- 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);
- {
- char name[4] = "";
- tmp = IPStack_AddInterface(Data, name);
- }
- 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, const void *Address1, const void *Address2, int CheckBits)
{
- tSocketFile *file = gIP_FileTemplates;
- while(Pos-- && file) {
- file = file->Next;
- }
+ int size = IPStack_GetAddressSize(AddressType);
+ Uint8 mask;
+ const Uint8 *addr1 = Address1, *addr2 = Address2;
- if(!file) return NULL;
+ // Sanity check size
+ if( CheckBits < 0 ) CheckBits = size*8;
+ 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, const char *Name)
-{
- tSocketFile *file = gIP_FileTemplates;
+ if( CheckBits == 0 ) return 1; // /0 matches anything
- // Get file definition
- for(;file;file = file->Next)
- {
- if( strcmp(file->Name, Name) == 0 ) break;
- }
- if(!file) return NULL;
+ // Check first bits/8 bytes
+ if( memcmp(Address1, Address2, CheckBits/8) != 0 ) return 0;
- // 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",
- "get_device",
- "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);
+ // Check if the mask is a multiple of 8
+ if( CheckBits % 8 == 0 ) return 1;
- 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;
-
- /*
- * get_device
- * - Gets the name of the attached device
- */
- case 10:
- if( Data == NULL )
- LEAVE_RET('i', iface->Adapter->DeviceLen);
- if( !CheckMem( Data, iface->Adapter->DeviceLen+1 ) )
- LEAVE_RET('i', -1);
- strcpy( Data, iface->Adapter->Device );
- return iface->Adapter->DeviceLen;
-
- /*
- * ping
- * - Send an ICMP Echo
- */
- case 11:
- 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(const char *Device, const char *Name)
-{
- tInterface *iface;
- tAdapter *card;
-
- ENTER("sDevice", Device);
-
- card = IPStack_GetAdapter(Device);
-
- iface = malloc(sizeof(tInterface) + strlen(Name));
- 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.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;
- iface->Node.MkNod = NULL;
- iface->Node.Link = NULL;
- iface->Node.Relink = NULL;
- iface->Node.Close = NULL;
-
- // 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
- }
-
- // Delay setting ImplInt until after the adapter is opened
- // Keeps things simple
- iface->Node.ImplInt = giIP_NextIfaceId++;
-
- // Append to list
- SHORTLOCK( &glIP_Interfaces );
- if( gIP_Interfaces ) {
- gIP_Interfaces_Last->Next = iface;
- gIP_Interfaces_Last = iface;
- }
- else {
- gIP_Interfaces = iface;
- gIP_Interfaces_Last = iface;
- }
- SHORTREL( &glIP_Interfaces );
-
- gIP_DriverInfo.RootNode.Size ++;
-
- // Success!
- LEAVE('i', iface->Node.ImplInt);
- return iface->Node.ImplInt;
-}
-
-/**
- * \fn tAdapter *IPStack_GetAdapter(const char *Path)
- * \brief Gets/opens an adapter given the path
- */
-tAdapter *IPStack_GetAdapter(const char *Path)
+const char *IPStack_PrintAddress(int AddressType, const void *Address)
{
- tAdapter *dev;
- int tmp;
-
- ENTER("sPath", Path);
-
- Mutex_Acquire( &glIP_Adapters );
-
- // Check if this adapter is already open
- for( dev = gIP_Adapters; dev; dev = dev->Next )
+ switch( AddressType )
{
- if( strcmp(dev->Device, Path) == 0 ) {
- dev->NRef ++;
- Mutex_Release( &glIP_Adapters );
- LEAVE('p', dev);
- return dev;
+ case 4: {
+ static char ret[4*3+3+1];
+ const Uint8 *addr = Address;
+ sprintf(ret, "%i.%i.%i.%i", addr[0], addr[1], addr[2], addr[3]);
+ return ret;
}
- }
-
- // Ok, so let's open it
- dev = malloc( sizeof(tAdapter) + strlen(Path) + 1 );
- if(!dev) {
- Mutex_Release( &glIP_Adapters );
- LEAVE('n');
- return NULL;
- }
-
- // Fill Structure
- strcpy( dev->Device, Path );
- dev->NRef = 1;
- dev->DeviceLen = strlen(Path);
- // Open Device
- dev->DeviceFD = VFS_Open( dev->Device, VFS_OPENFLAG_READ|VFS_OPENFLAG_WRITE );
- if( dev->DeviceFD == -1 ) {
- free( dev );
- Mutex_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 );
- Mutex_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;
-
- Mutex_Release( &glIP_Adapters );
-
- // Start watcher
- Link_WatchDevice( dev );
+ case 6: { // TODO: address compression
+ static char ret[8*4+7+1];
+ const Uint16 *addr = Address;
+ sprintf(ret, "%x:%x:%x:%x:%x:%x:%x:%x",
+ ntohs(addr[0]), ntohs(addr[1]), ntohs(addr[2]), ntohs(addr[3]),
+ ntohs(addr[4]), ntohs(addr[5]), ntohs(addr[6]), ntohs(addr[7])
+ );
+ return ret;
+ }
- LEAVE('p', dev);
- return dev;
-}
-
-/**
- * \brief Gets the size (in bytes) of a specified form of address
- */
-int IPStack_GetAddressSize(int AddressType)
-{
- switch(AddressType)
- {
default:
- case AF_NULL:
- return 0;
- case AF_INET4:
- return sizeof(tIPv4);
- case AF_INET6:
- return sizeof(tIPv6);
+ return "";
}
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au