X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FIPStack%2Frouting.c;h=3153ef269efa016715d173fd5921505ec2b5746f;hb=ab5e490b4d1fba7570595b87d79d46c00c3ad8ac;hp=c4b539262ed5fab4993070eb36706ec69b106bd0;hpb=33495f1efd207f0af4f804858f247db0983fcb8f;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/IPStack/routing.c b/KernelLand/Modules/IPStack/routing.c
index c4b53926..3153ef26 100644
--- a/KernelLand/Modules/IPStack/routing.c
+++ b/KernelLand/Modules/IPStack/routing.c
@@ -20,7 +20,7 @@ extern tVFS_Node	*IPStack_Root_FindDir(tVFS_Node *Node, const char *Filename);
 char	*IPStack_RouteDir_ReadDir(tVFS_Node *Node, int Pos);
 tVFS_Node	*IPStack_RouteDir_FindDir(tVFS_Node *Node, const char *Name);
  int	IPStack_RouteDir_MkNod(tVFS_Node *Node, const char *Name, Uint Flags);
- int	IPStack_RouteDir_Relink(tVFS_Node *Node, const char *OldName, const char *NewName);
+ int	IPStack_RouteDir_Unlink(tVFS_Node *Node, const char *OldName);
 tRoute	*_Route_FindExactRoute(int Type, void *Network, int Subnet, int Metric);
  int	_Route_ParseRouteName(const char *Name, void *Addr, int *SubnetBits, int *Metric);
  int	IPStack_RouteDir_IOCtl(tVFS_Node *Node, int ID, void *Data);
@@ -43,7 +43,7 @@ tVFS_NodeType	gIP_RouteDirNodeType = {
 	.ReadDir = IPStack_RouteDir_ReadDir,
 	.FindDir = IPStack_RouteDir_FindDir,
 	.MkNod = IPStack_RouteDir_MkNod,
-	.Relink = IPStack_RouteDir_Relink,
+	.Unlink = IPStack_RouteDir_Unlink,
 	.IOCtl = IPStack_RouteDir_IOCtl
 };
 tVFS_Node	gIP_RouteNode = {
@@ -195,7 +195,7 @@ int IPStack_RouteDir_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
 /**
  * \brief Rename / Delete a route
  */
-int IPStack_RouteDir_Relink(tVFS_Node *Node, const char *OldName, const char *NewName)
+int IPStack_RouteDir_Unlink(tVFS_Node *Node, const char *OldName)
 {
 	tRoute	*rt;
 	
@@ -212,29 +212,15 @@ int IPStack_RouteDir_Relink(tVFS_Node *Node, const char *OldName, const char *Ne
 		rt = _Route_FindExactRoute(type, addr, subnet, metric);
 	}	
 
-	if( NewName == NULL )
-	{
-		// Delete the route
-		tRoute	*prev = NULL;
-		for(tRoute *r = gIP_Routes; r && r != rt; prev = r, r = r->Next);
-		
-		if(prev)
-			prev->Next = rt->Next;
-		else
-			gIP_Routes = rt->Next;
-		free(rt);
-	}
-	else
-	{
-		// Change the route
-		 int	type = _Route_ParseRouteName(NewName, NULL, NULL, NULL);
-		if(type <= 0)	return -EINVAL;
-		Uint8	addr[IPStack_GetAddressSize(type)];
-		 int	subnet, metric;
-		_Route_ParseRouteName(NewName, addr, &subnet, &metric);
+	// Delete the route
+	tRoute	*prev = NULL;
+	for(tRoute *r = gIP_Routes; r && r != rt; prev = r, r = r->Next);
 	
-		return -ENOTIMPL;	
-	}
+	if(prev)
+		prev->Next = rt->Next;
+	else
+		gIP_Routes = rt->Next;
+	free(rt);
 	return 0;
 }