X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FIPStack%2Frouting.c;h=24bb8fa2e43ac4370ccf0e872324eedd22133c80;hb=8a3c7218fb65c46c0876b7033b732188be91ae03;hp=d9efa99f4e0392c37b6980b915370a0f29649047;hpb=4ebe00546574e97c5316881881f7f2562deea74b;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/IPStack/routing.c b/KernelLand/Modules/IPStack/routing.c
index d9efa99f..24bb8fa2 100644
--- a/KernelLand/Modules/IPStack/routing.c
+++ b/KernelLand/Modules/IPStack/routing.c
@@ -18,7 +18,7 @@ extern tVFS_Node	*IPStack_Root_FindDir(tVFS_Node *Node, const char *Filename);
 // === PROTOTYPES ===
 // - Routes directory
  int	IPStack_RouteDir_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX]);
-tVFS_Node	*IPStack_RouteDir_FindDir(tVFS_Node *Node, const char *Name);
+tVFS_Node	*IPStack_RouteDir_FindDir(tVFS_Node *Node, const char *Name, Uint Flags);
 tVFS_Node	*IPStack_RouteDir_MkNod(tVFS_Node *Node, const char *Name, Uint Flags);
  int	IPStack_RouteDir_Unlink(tVFS_Node *Node, const char *OldName);
 tRoute	*_Route_FindExactRoute(int Type, void *Network, int Subnet, int Metric);
@@ -27,8 +27,8 @@ tRoute	*_Route_FindExactRoute(int Type, void *Network, int Subnet, int Metric);
 // - Route Management
 tRoute	*IPStack_Route_Create(int AddrType, void *Network, int SubnetBits, int Metric);
 tRoute	*IPStack_AddRoute(const char *Interface, void *Network, int SubnetBits, void *NextHop, int Metric);
-tRoute	*_Route_FindInterfaceRoute(int AddressType, void *Address);
-tRoute	*IPStack_FindRoute(int AddressType, tInterface *Interface, void *Address);
+tRoute	*_Route_FindInterfaceRoute(int AddressType, const void *Address);
+tRoute	*IPStack_FindRoute(int AddressType, tInterface *Interface, const void *Address);
 // - Individual Routes
  int	IPStack_Route_IOCtl(tVFS_Node *Node, int ID, void *Data);
 
@@ -78,7 +78,7 @@ int IPStack_RouteDir_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX])
 /**
  * \brief FindDir for the /Devices/ip/routes/ directory
  */
-tVFS_Node *IPStack_RouteDir_FindDir(tVFS_Node *Node, const char *Name)
+tVFS_Node *IPStack_RouteDir_FindDir(tVFS_Node *Node, const char *Name, Uint Flags)
 {
 	// Interpret the name as <type>:<addr>, returning the interface for
 	// needed to access that address.
@@ -115,12 +115,13 @@ tVFS_Node *IPStack_RouteDir_FindDir(tVFS_Node *Node, const char *Name)
 		{	
 			LOG("Why does this route not have a node? trying to find an iface for the next hop");
 
-			rt = _Route_FindInterfaceRoute(type, rt->NextHop);
-			if(!rt) {
+			void *nextrt = _Route_FindInterfaceRoute(type, rt->NextHop);
+			if(!nextrt) {
 				Log_Notice("Cannot find route to next hop '%s'",
 					IPStack_PrintAddress(type, rt->NextHop));
 				return NULL;
 			}
+			rt = nextrt;
 		}
 		if( !rt->Interface ) {
 			Log_Notice("Routes", "No interface for route %p, what the?", rt);
@@ -443,7 +444,7 @@ tRoute *IPStack_AddRoute(const char *Interface, void *Network, int SubnetBits, v
 /**
  * \brief Locates what interface should be used to get directly to an address
  */
-tRoute *_Route_FindInterfaceRoute(int AddressType, void *Address)
+tRoute *_Route_FindInterfaceRoute(int AddressType, const void *Address)
 {
 	tRoute	*best = NULL, *rt;
 	 int addrSize = IPStack_GetAddressSize(AddressType);
@@ -486,7 +487,7 @@ tRoute *_Route_FindInterfaceRoute(int AddressType, void *Address)
 
 /**
  */
-tRoute *IPStack_FindRoute(int AddressType, tInterface *Interface, void *Address)
+tRoute *IPStack_FindRoute(int AddressType, tInterface *Interface, const void *Address)
 {
 	tRoute	*rt;
 	tRoute	*best = NULL;