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

diff --git a/Modules/IPStack/main.c b/Modules/IPStack/main.c
index 6dac9382..2b04a6a5 100644
--- a/Modules/IPStack/main.c
+++ b/Modules/IPStack/main.c
@@ -22,6 +22,7 @@ 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);
@@ -114,11 +115,68 @@ int IPStack_Install(char **Arguments)
 					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>
+			// 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;
+			}
 		}
 	}