// === 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);
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>
+ // 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;
+ }
}
}
/**
* \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 < 0 ) CheckBits = size*8;
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;
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]