#define DEBUG 0
#define VERSION VER2(0,10)
#include <acess.h>
-#include <tpl_drv_common.h>
+#include <api_drv_common.h>
#include "ipstack.h"
#include "link.h"
// - Routes directory
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);
+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);
// - Route Management
-tRoute *IPStack_Route_Create(const char *InterfaceName);
+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 *IPStack_FindRoute(int AddressType, tInterface *Interface, void *Address);
// - Individual Routes
int giIP_NextRouteId = 1;
tRoute *gIP_Routes;
tRoute *gIP_RoutesEnd;
+tVFS_NodeType gIP_RouteNodeType = {
+ .IOCtl = IPStack_Route_IOCtl
+};
+tVFS_NodeType gIP_RouteDirNodeType = {
+ .ReadDir = IPStack_RouteDir_ReadDir,
+ .FindDir = IPStack_RouteDir_FindDir,
+ .MkNod = IPStack_RouteDir_MkNod,
+ .Relink = IPStack_RouteDir_Relink,
+ .IOCtl = IPStack_RouteDir_IOCtl
+};
tVFS_Node gIP_RouteNode = {
.Flags = VFS_FFLAG_DIRECTORY,
.Size = -1,
.NumACLs = 1,
.ACLs = &gVFS_ACL_EveryoneRX,
- .ReadDir = IPStack_RouteDir_ReadDir,
- .FindDir = IPStack_RouteDir_FindDir,
- .IOCtl = IPStack_RouteDir_IOCtl
+ .Type = &gIP_RouteDirNodeType
};
// === CODE ===
tRoute *rt;
for(rt = gIP_Routes; rt && Pos --; rt = rt->Next);
-
- if( !rt ) {
- return NULL;
- }
+ if( !rt ) return NULL;
{
- int len = sprintf(NULL, "%i", rt->Node.Inode);
+ int addrlen = IPStack_GetAddressSize(rt->AddressType);
+ int len = sprintf(NULL, "%i::%i:%i", rt->AddressType, rt->SubnetBits, rt->Metric) + addrlen*2;
char buf[len+1];
- sprintf(buf, "%i", rt->Node.Inode);
+ int ofs;
+ ofs = sprintf(buf, "%i:", rt->AddressType);
+ ofs += Hex(buf+ofs, addrlen, rt->Network);
+ sprintf(buf+ofs, ":%i:%i", rt->SubnetBits, rt->Metric);
return strdup(buf);
}
}
*/
tVFS_Node *IPStack_RouteDir_FindDir(tVFS_Node *Node, const char *Name)
{
- int num = atoi(Name);
- tRoute *rt;
-
- // Zero is invalid, sorry :)
- if( !num ) return NULL;
-
// Interpret the name as <type>:<addr>, returning the interface for
// needed to access that address.
- // E.g. '4:0A02000A' - 10.2.0.10
+ // E.g. '@4:0A02000A' - 10.2.0.10
// Hm... It could do with a way to have a better address type representation
- if( Name[1] == ':' ) // TODO: Allow variable length type codes
+ if( Name[0] == '@' )
{
- int addrSize = IPStack_GetAddressSize(num);
- Uint8 addrData[addrSize];
+ tRoute *rt;
+ int ofs = 1;
+ int type;
- // Errof if the size is invalid
- if( strlen(Name) != 2 + addrSize*2 )
+ ofs += ParseInt(Name+ofs, &type);
+ int addrSize = IPStack_GetAddressSize(type);
+ Uint8 addrData[addrSize];
+
+ // Separator
+ if( Name[ofs] != ':' ) return NULL;
+ ofs ++;
+
+ // Error if the size is invalid
+ if( strlen(Name+ofs) != addrSize*2 )
return NULL;
// Parse the address
// - Error if the address data is not fully hex
- if( UnHex(addrData, addrSize, Name + 2) != addrSize )
+ if( UnHex(addrData, addrSize, Name + ofs) != addrSize )
return NULL;
// Find the route
- rt = IPStack_FindRoute(num, NULL, addrData);
+ rt = IPStack_FindRoute(type, NULL, addrData);
if(!rt) return NULL;
+
+ if( rt->Interface )
+ {
+ // Return the interface node
+ // - Sure it's hijacking it from inteface.c's area, but it's
+ // simpler this way
+ return &rt->Interface->Node;
+ }
+ else
+ {
+ return NULL;
+ }
+ }
+ else if( Name[0] == '#' )
+ {
+ int num, ofs = 1;
- // Return the interface node
- // - Sure it's hijacking it from inteface.c's area, but it's
- // simpler this way
- return &rt->Interface->Node;
+ ofs = ParseInt(Name+ofs, &num);
+ if( ofs == 1 ) return NULL;
+ if( Name[ofs] != '\0' ) return NULL;
+ if( num < 0) return NULL;
+
+ for( tRoute *rt = gIP_Routes; rt; rt = rt->Next )
+ {
+ if( rt->Node.Inode > num ) return NULL;
+ if( rt->Node.Inode == num ) return &rt->Node;
+ }
+ return NULL;
}
+ else
+ {
+ int type = _Route_ParseRouteName(Name, NULL, NULL, NULL);
+ if( type <= 0 ) return NULL;
+
+ int addrSize = IPStack_GetAddressSize(type);
+ Uint8 addrData[addrSize];
+ int subnet_bits, metric;
+
+ _Route_ParseRouteName(Name, addrData, &subnet_bits, &metric);
+
+ tRoute *rt = _Route_FindExactRoute(type, addrData, subnet_bits, metric);
+ if(rt) return &rt->Node;
+ return NULL;
+ }
+}
+
+/**
+ * \brief Create a new route node
+ */
+int IPStack_RouteDir_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
+{
+ if( Flags ) return -EINVAL;
+ if( Threads_GetUID() != 0 ) return -EACCES;
+
+ int type = _Route_ParseRouteName(Name, NULL, NULL, NULL);
+ if( type <= 0 ) return -EINVAL;
+
+ int size = IPStack_GetAddressSize(type);
+ Uint8 addrdata[size];
+ int subnet, metric;
+
+ _Route_ParseRouteName(Name, addrdata, &subnet, &metric);
+
+ // Check for duplicates
+ if( _Route_FindExactRoute(type, addrdata, subnet, metric) )
+ return -EEXIST;
+
+ IPStack_Route_Create(type, addrdata, subnet, metric);
+
+ return 0;
+}
+
+/**
+ * \brief Rename / Delete a route
+ */
+int IPStack_RouteDir_Relink(tVFS_Node *Node, const char *OldName, const char *NewName)
+{
+ tRoute *rt;
- // The list is inherently sorted, so we can do a quick search
- for(rt = gIP_Routes; rt && rt->Node.Inode < num; rt = rt->Next);
+ if( Threads_GetUID() != 0 ) return -EACCES;
+
+ // Get the original route entry
+ {
+ int type = _Route_ParseRouteName(OldName, NULL, NULL, NULL);
+ if(type <= 0) return -EINVAL;
+ Uint8 addr[IPStack_GetAddressSize(type)];
+ int subnet, metric;
+ _Route_ParseRouteName(OldName, addr, &subnet, &metric);
+
+ 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);
+
+ return -ENOTIMPL;
+ }
+ return 0;
+}
+
+tRoute *_Route_FindExactRoute(int Type, void *Network, int Subnet, int Metric)
+{
+ for(tRoute *rt = gIP_Routes; rt; rt = rt->Next)
+ {
+ if( rt->AddressType != Type ) continue;
+ if( rt->Metric != Metric ) continue;
+ if( rt->SubnetBits != Subnet ) continue;
+ if( IPStack_CompareAddress(Type, rt->Network, Network, -1) == 0 )
+ continue ;
+ return rt;
+ }
+ return NULL;
+}
+
+int _Route_ParseRouteName(const char *Name, void *Addr, int *SubnetBits, int *Metric)
+{
+ int type, addrlen;
+ int ofs = 0, ilen;
- // Fast fail end of list / larger number
- if( !rt || rt->Node.Inode > num )
- return NULL;
+ ENTER("sName pAddr pSubnetBits pMetric", Name, Addr, SubnetBits, Metric);
+
+ ilen = ParseInt(Name, &type);
+ if(ilen == 0) {
+ LOG("Type failed to parse");
+ LEAVE_RET('i', -1);
+ }
+ ofs += ilen;
+
+ if(Name[ofs] != ':') LEAVE_RET('i', -1);
+ ofs ++;
+
+ addrlen = IPStack_GetAddressSize(type);
+ if( Addr )
+ {
+ if( UnHex(Addr, addrlen, Name + ofs) != addrlen )
+ return -1;
+ }
+ ofs += addrlen*2;
+
+ if(Name[ofs] != ':') LEAVE_RET('i', -1);
+ ofs ++;
+
+ ilen = ParseInt(Name+ofs, SubnetBits);
+ if(ilen == 0) {
+ LOG("Subnet failed to parse");
+ LEAVE_RET('i', -1);
+ }
+ ofs += ilen;
- return &rt->Node;
+ if(Name[ofs] != ':') LEAVE_RET('i', -1);
+ ofs ++;
+
+ ilen = ParseInt(Name+ofs, Metric);
+ if(ilen == 0) {
+ LOG("Metric failed to parse");
+ LEAVE_RET('i', -1);
+ }
+ ofs += ilen;
+
+ if(Name[ofs] != '\0') LEAVE_RET('i', -1);
+
+ LEAVE('i', type);
+ return type;
}
/**
*/
static const char *casIOCtls_RouteDir[] = {
DRV_IOCTLNAMES,
- "add_route", // Add a route - char *InterfaceName
"locate_route", // Find the best route for an address - struct {int Type, char Address[]} *
NULL
};
*/
int IPStack_RouteDir_IOCtl(tVFS_Node *Node, int ID, void *Data)
{
- int tmp;
tRoute *rt;
ENTER("pNode iID pData", Node, ID, Data);
switch(ID)
// --- Standard IOCtls (0-3) ---
BASE_IOCTLS(DRV_TYPE_MISC, STR(IDENT), VERSION, casIOCtls_RouteDir)
- case 4: // Add Route
- if( !CheckString(Data) ) LEAVE_RET('i', -1);
- rt = IPStack_Route_Create(Data);
- if( !rt )
- tmp = -1;
- else
- tmp = rt->Node.Inode;
- LEAVE('i', tmp);
- return tmp;
-
- case 5: // Locate Route
+ case 4: // Locate Route
{
struct {
int Type;
* \brief Create a new route entry
* \param InterfaceName Name of the interface using this route
*/
-tRoute *IPStack_Route_Create(const char *InterfaceName)
+tRoute *IPStack_Route_Create(int AddrType, void *Network, int SubnetBits, int Metric)
{
tRoute *rt;
- tInterface *iface;
int size;
- // Get interface
- // Note: Oh man! This is such a hack
- {
- tVFS_Node *node = IPStack_Root_FindDir(NULL, InterfaceName);
- if( !node ) {
- Log_Debug("IPStack", "IPStack_Route_Create - Unknown interface '%s'\n", InterfaceName);
- return NULL;
- }
- iface = node->ImplPtr;
- if(node->Close) node->Close(node);
- }
-
// Get the size of the specified address type
- size = IPStack_GetAddressSize(iface->Type);
+ size = IPStack_GetAddressSize(AddrType);
if( size == 0 ) {
return NULL;
}
rt->Node.Size = 0;
rt->Node.NumACLs = 1,
rt->Node.ACLs = &gVFS_ACL_EveryoneRO;
- rt->Node.IOCtl = IPStack_Route_IOCtl;
+ rt->Node.Type = &gIP_RouteNodeType;
// Set up state
- rt->AddressType = iface->Type;
+ rt->AddressType = AddrType;
rt->Network = (void *)( (tVAddr)rt + sizeof(tRoute) );
- rt->SubnetBits = 0;
+ rt->SubnetBits = SubnetBits;
rt->NextHop = (void *)( (tVAddr)rt + sizeof(tRoute) + size );
- rt->Interface = iface;
- rt->Metric = DEFAUTL_METRIC;
- memset(rt->Network, 0, size);
+ rt->Interface = NULL;
+ rt->Metric = Metric;
+ memcpy(rt->Network, Network, size);
memset(rt->NextHop, 0, size);
+ // Clear non-fixed bits
+ {
+ Uint8 *data = rt->Network;
+ int i;
+ i = SubnetBits / 8;
+ if( SubnetBits % 8 ) {
+ data[i] &= ~((1 << (8 - SubnetBits % 8)) - 1);
+ i ++;
+ }
+ memset(data + i, 0, size - i);
+ }
+
+
// Add to list
if( gIP_RoutesEnd ) {
gIP_RoutesEnd->Next = rt;
gIP_Routes = gIP_RoutesEnd = rt;
}
- Log_Log("IPStack", "Route entry for '%s' created", InterfaceName);
+// Log_Log("IPStack", "Route entry for '%s' created", InterfaceName);
return rt;
}
*/
tRoute *IPStack_AddRoute(const char *Interface, void *Network, int SubnetBits, void *NextHop, int Metric)
{
- tRoute *rt = IPStack_Route_Create(Interface);
+ tInterface *iface;
+ tRoute *rt;
int addrSize;
+ {
+ tVFS_Node *tmp;
+ tmp = IPStack_Root_FindDir(NULL, Interface);
+ if(!tmp) return NULL;
+ iface = tmp->ImplPtr;
+ if(tmp->Type->Close) tmp->Type->Close(tmp);
+ }
+
+ rt = IPStack_Route_Create(iface->Type, Network, SubnetBits, Metric);
if( !rt ) return NULL;
- addrSize = IPStack_GetAddressSize(rt->Interface->Type);
+ addrSize = IPStack_GetAddressSize(iface->Type);
+ rt->Interface = iface;
- memcpy(rt->Network, Network, addrSize);
if( NextHop )
memcpy(rt->NextHop, NextHop, addrSize);
- rt->SubnetBits = SubnetBits;
- if( Metric )
- rt->Metric = Metric;
return rt;
}
{
rt = &Interface->Route;
// Make sure route is up to date
- memcpy(rt->Network, iface->Address, addrSize);
+ memcpy(rt->Network, Interface->Address, addrSize);
memset(rt->NextHop, 0, addrSize);
rt->Metric = DEFAUTL_METRIC;
- rt->SubnetBits = iface->SubnetBits;
+ rt->SubnetBits = Interface->SubnetBits;
if( IPStack_CompareAddress(AddressType, rt->Network, Address, rt->SubnetBits) )
{
*/
static const char *casIOCtls_Route[] = {
DRV_IOCTLNAMES,
- "get_type", // Get address type - (void), returns integer type
- "get_network", // Get network - (void *Data), returns boolean success
- "set_network", // Set network - (void *Data), returns boolean success
"get_nexthop", // Get next hop - (void *Data), returns boolean success
"set_nexthop", // Set next hop - (void *Data), returns boolean success
- "getset_subnetbits", // Get/Set subnet bits - (int *Bits), returns current value
- "getset_metric", // Get/Set metric - (int *Metric), returns current value
"get_interface", // Get interface name - (char *Name), returns name length, NULL OK
+ "set_interface", // Set interface - (const char *Name)
NULL
};
*/
int IPStack_Route_IOCtl(tVFS_Node *Node, int ID, void *Data)
{
- int *iData = Data;
tRoute *rt = Node->ImplPtr;
int addrSize = IPStack_GetAddressSize(rt->AddressType);
// --- Standard IOCtls (0-3) ---
BASE_IOCTLS(DRV_TYPE_MISC, STR(IDENT), VERSION, casIOCtls_Route)
- // Get address type
- case 4:
- return rt->AddressType;
-
- // Get Network
- case 5:
- if( !CheckMem(Data, addrSize) ) return -1;
- memcpy(Data, rt->Network, addrSize);
- return 1;
- // Set Network
- case 6:
- if( !CheckMem(Data, addrSize) ) return -1;
- memcpy(rt->Network, Data, addrSize);
- return 1;
-
// Get Next Hop
- case 7:
+ case 4:
if( !CheckMem(Data, addrSize) ) return -1;
memcpy(Data, rt->NextHop, addrSize);
return 1;
// Set Next Hop
- case 8:
+ case 5:
+ if( Threads_GetUID() != 0 ) return -1;
if( !CheckMem(Data, addrSize) ) return -1;
memcpy(rt->NextHop, Data, addrSize);
return 1;
-
- // Get/Set Subnet Bits
- case 9:
- if( Data ) {
- if( !CheckMem(Data, sizeof(int)) ) return -1;
- if( *iData < 0 || *iData > addrSize*8 )
+
+ // Get interface name
+ case 6:
+ if( !rt->Interface ) {
+ if(Data && !CheckMem(Data, 1) )
return -1;
- rt->SubnetBits = *iData;
+ if(Data)
+ *(char*)Data = 0;
+ return 0;
}
- return rt->SubnetBits;
-
- // Get/Set Metric
- case 10:
- if( Data ) {
- if( !CheckMem(Data, sizeof(int)) ) return -1;
- if( *iData < 0 ) return -1;
- rt->Metric = *iData;
- }
- return rt->Metric;
-
- // Get interface name
- case 11:
if( Data ) {
if( !CheckMem(Data, strlen(rt->Interface->Name) + 1) )
return -1;
strcpy(Data, rt->Interface->Name);
}
return strlen(rt->Interface->Name);
+ // Set interface name
+ case 7:
+ if( Threads_GetUID() != 0 )
+ return -1;
+ if( !CheckString(Data) )
+ return -1;
+ else
+ {
+ tInterface *iface;
+ tVFS_Node *tmp;
+ tmp = IPStack_Root_FindDir(NULL, Data);
+ if(!tmp)
+ return -1;
+ iface = tmp->ImplPtr;
+ if(tmp->Type->Close) tmp->Type->Close(tmp);
+
+ if( iface->Type != rt->AddressType )
+ return -1;
+
+ // TODO: Other checks?
+ rt->Interface = iface;
+ }
+ return 0;
+
default:
return -1;
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au