X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Fmain.c;h=5aa671520bf7809ef2f6c6f4449a1aff199a5fa9;hb=4f1a9b430a3fa57bbe52a6a2fe546f6fe93c389d;hp=8e3810d9ceefe92d94d74dc92fde124c8d68052c;hpb=e6eafcb86732068e2094f04a2452098c13256336;p=tpg%2Facess2.git diff --git a/Modules/IPStack/main.c b/Modules/IPStack/main.c index 8e3810d9..5aa67152 100644 --- a/Modules/IPStack/main.c +++ b/Modules/IPStack/main.c @@ -21,10 +21,12 @@ 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_CompareAddress(int AddressType, void *Address1, void *Address2, int CheckBits); + int IPStack_CompareAddress(int AddressType, const void *Address1, const void *Address2, int CheckBits); // === GLOBALS === MODULE_DEFINE(0, VERSION, IPStack, IPStack_Install, NULL, NULL); @@ -64,17 +66,121 @@ int IPStack_Install(char **Arguments) for( i = 0; Arguments[i]; i++ ) { // TODO: - // Define interfaces by ,,, + // Define interfaces by ::: // Where: // - is the device path (E.g. /Devices/ne2k/0) // - is a number (e.g. 4) or symbol (e.g. AF_INET4) // - is a condensed hexadecimal stream (in big endian) // (E.g. 0A000201 for 10.0.2.1 IPv4) // - is the number of subnet bits (E.g. 24 for an IPv4 Class C) - // Example: /Devices/ne2k/0,4,0A00020A,24 + // 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", ":::"); + continue; + } + *type = '\0'; type ++; + + addr = strchr(type, ':'); + if( !addr ) { + Log_Warning("IPStack", ":::"); + continue; + } + *addr = '\0'; addr ++; + + bits = strchr(addr, ':'); + if( !bits ) { + Log_Warning("IPStack", ":::"); + 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); + } + + continue; + } - // I could also define routes using ,,, - // Example: 1,00000000,0,0A000201 + // I could also define routes using ::[:] + // 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", ":::"); + continue; + } + *network = '\0'; network ++; + + bits = strchr(network, ':'); + if( !bits ) { + Log_Warning("IPStack", ":::"); + 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; + } } } @@ -112,17 +218,17 @@ int IPStack_GetAddressSize(int AddressType) /** * \brief Compare two IP Addresses masked by CheckBits */ -int IPStack_CompareAddress(int AddressType, void *Address1, void *Address2, int CheckBits) +int IPStack_CompareAddress(int AddressType, const void *Address1, const void *Address2, int CheckBits) { int size = IPStack_GetAddressSize(AddressType); Uint8 mask; - Uint8 *addr1 = Address1, *addr2 = Address2; + const Uint8 *addr1 = Address1, *addr2 = Address2; // Sanity check size if( CheckBits < 0 ) CheckBits = 0; if( CheckBits > size*8 ) CheckBits = size*8; - if( CheckBits == 0 ) return 1; // /0 matches anythin0 + if( CheckBits == 0 ) return 1; // /0 matches anything // Check first bits/8 bytes if( memcmp(Address1, Address2, CheckBits/8) != 0 ) return 0; @@ -138,20 +244,20 @@ int IPStack_CompareAddress(int AddressType, void *Address1, void *Address2, int return 0; } -const char *IPStack_PrintAddress(int AddressType, void *Address) +const char *IPStack_PrintAddress(int AddressType, const void *Address) { switch( AddressType ) { case 4: { static char ret[4*3+3+1]; - Uint8 *addr = Address; + const Uint8 *addr = Address; sprintf(ret, "%i.%i.%i.%i", addr[0], addr[1], addr[2], addr[3]); return ret; } - case 6: { + case 6: { // TODO: address compression static char ret[8*4+7+1]; - Uint16 *addr = Address; + const Uint16 *addr = Address; sprintf(ret, "%x:%x:%x:%x:%x:%x:%x:%x", addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], addr[6], addr[7]