X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Frouting.c;h=26817b65b106e7aeaa7bb3280c506349be175782;hb=89d57929e1e4f83a55d32a1d0084e4ed0296f521;hp=53d5c885b1d44b32453fc18e08d470dd6026a2ef;hpb=d5822e9af597f656dccc6afe8dacabcfbb2fc0af;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/routing.c b/Modules/IPStack/routing.c
index 53d5c885..26817b65 100644
--- a/Modules/IPStack/routing.c
+++ b/Modules/IPStack/routing.c
@@ -251,6 +251,8 @@ tRoute *IPStack_FindRoute(int AddressType, tInterface *Interface, void *Address)
 {
 	tRoute	*rt;
 	tRoute	*best = NULL;
+	tInterface	*iface;
+	 int	addrSize;
 	
 	ENTER("iAddressType pInterface sAddress",
 		AddressType, Interface, IPStack_PrintAddress(AddressType, Address));
@@ -261,6 +263,10 @@ tRoute *IPStack_FindRoute(int AddressType, tInterface *Interface, void *Address)
 		return NULL;
 	}
 	
+	// Get address size
+	addrSize = IPStack_GetAddressSize(AddressType);
+	
+	// Check against explicit routes
 	for( rt = gIP_Routes; rt; rt = rt->Next )
 	{
 		// Check interface
@@ -290,6 +296,56 @@ tRoute *IPStack_FindRoute(int AddressType, tInterface *Interface, void *Address)
 		best = rt;
 	}
 	
+	// Check against implicit routes
+	if( !best && !Interface )
+	{
+		for( iface = gIP_Interfaces; iface; iface = iface->Next )
+		{
+			if( Interface && iface != Interface )	continue;
+			if( iface->Type != AddressType )	continue;
+			
+			
+			// Check if the address matches
+			if( !IPStack_CompareAddress(AddressType, iface->Address, Address, iface->SubnetBits) )
+				continue;
+			
+			if( best ) {
+				// More direct routes are preferred
+				if( best->SubnetBits > rt->SubnetBits ) {
+					LOG("Skipped - less direct (%i < %i)", rt->SubnetBits, best->SubnetBits);
+					continue;
+				}
+				// If equally direct, choose the best metric
+				if( best->SubnetBits == rt->SubnetBits && best->Metric < rt->Metric ) {
+					LOG("Skipped - higher metric (%i > %i)", rt->Metric, best->Metric);
+					continue;
+				}
+			}
+			
+			rt = &iface->Route;
+			memcpy(rt->Network, iface->Address, addrSize);
+			memset(rt->NextHop, 0, addrSize);
+			rt->Metric = DEFAUTL_METRIC;
+			rt->SubnetBits = iface->SubnetBits;
+			
+			best = rt;
+		}
+	}
+	if( !best && Interface )
+	{
+		rt = &Interface->Route;
+		// Make sure route is up to date
+		memcpy(rt->Network, iface->Address, addrSize);
+		memset(rt->NextHop, 0, addrSize);
+		rt->Metric = DEFAUTL_METRIC;
+		rt->SubnetBits = iface->SubnetBits;
+		
+		if( IPStack_CompareAddress(AddressType, rt->Network, Address, rt->SubnetBits) )
+		{
+			best = rt;
+		}
+	}
+	
 	LEAVE('p', best);
 	return best;
 }