X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Fmain.c;h=2b04a6a560f0024847e10650811c21d8591cc23c;hb=11e9a26f9aa039eb2b4edcf55c1295e640b5999a;hp=bec82b338bb66e07d2a290d98f6e2d144e9283f8;hpb=8051546ad5894e093211d2ec69dde6b99cdaa71d;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/main.c b/Modules/IPStack/main.c
index bec82b33..2b04a6a5 100644
--- a/Modules/IPStack/main.c
+++ b/Modules/IPStack/main.c
@@ -21,6 +21,8 @@ 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);
@@ -64,17 +66,117 @@ int IPStack_Install(char **Arguments)
 		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
+			// 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, "");
+					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 <Interface>,<HexStreamNetwork>,<Bits>,<HexStreamGateway>
-			// Example: 1,00000000,0,0A000201
+			// 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;
+			}
 		}
 	}
 	
@@ -122,6 +224,8 @@ int IPStack_CompareAddress(int AddressType, void *Address1, void *Address2, int
 	if( CheckBits < 0 )	CheckBits = 0;
 	if( CheckBits > size*8 )	CheckBits = size*8;
 	
+	if( CheckBits == 0 )	return 1;	// /0 matches anythin0
+	
 	// Check first bits/8 bytes
 	if( memcmp(Address1, Address2, CheckBits/8) != 0 )	return 0;
 	
@@ -135,3 +239,29 @@ int IPStack_CompareAddress(int AddressType, void *Address1, void *Address2, int
 	
 	return 0;
 }
+
+const char *IPStack_PrintAddress(int AddressType, void *Address)
+{
+	switch( AddressType )
+	{
+	case 4: {
+		static char	ret[4*3+3+1];
+		Uint8	*addr = Address;
+		sprintf(ret, "%i.%i.%i.%i", addr[0], addr[1], addr[2], addr[3]);
+		return ret;
+		}
+	
+	case 6: {
+		static char	ret[8*4+7+1];
+		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]
+			);
+		return ret;
+		}
+	
+	default:
+		return "";
+	}
+}