X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Finterface.c;h=82d1b8c43d14356550946df291599d073eaea92c;hb=57c1e8ff3a5e475ff5fe457ede46a4b3598b91f2;hp=50d4c229177e7b313f6a712fd34af1e5df129e94;hpb=f429a25f24ffd4762d59bee5f7122ac06881f3ca;p=tpg%2Facess2.git diff --git a/Modules/IPStack/interface.c b/Modules/IPStack/interface.c index 50d4c229..82d1b8c4 100644 --- a/Modules/IPStack/interface.c +++ b/Modules/IPStack/interface.c @@ -6,8 +6,8 @@ #define VERSION VER2(0,10) #include "ipstack.h" #include "link.h" -#include -#include +#include +#include // === CONSTANTS === //! Default timeout value, 30 seconds @@ -34,18 +34,18 @@ tVFS_Node *IPStack_Iface_FindDir(tVFS_Node *Node, const char *Name); // === GLOBALS === //! Loopback (127.0.0.0/8, ::1) Pseudo-Interface tInterface gIP_LoopInterface = { - Node: { - ImplPtr: &gIP_LoopInterface, - Flags: VFS_FFLAG_DIRECTORY, - Size: -1, - NumACLs: 1, - ACLs: &gVFS_ACL_EveryoneRX, - ReadDir: IPStack_Iface_ReadDir, - FindDir: IPStack_Iface_FindDir, - IOCtl: IPStack_Iface_IOCtl + .Node = { + .ImplPtr = &gIP_LoopInterface, + .Flags = VFS_FFLAG_DIRECTORY, + .Size = -1, + .NumACLs = 1, + .ACLs = &gVFS_ACL_EveryoneRX, + .ReadDir = IPStack_Iface_ReadDir, + .FindDir = IPStack_Iface_FindDir, + .IOCtl = IPStack_Iface_IOCtl }, - Adapter: NULL, - Type: 0 + .Adapter = NULL, + .Type = 0 }; tShortSpinlock glIP_Interfaces; tInterface *gIP_Interfaces = NULL; @@ -54,8 +54,8 @@ tInterface *gIP_Interfaces_Last = NULL; tSocketFile *gIP_FileTemplates; tAdapter gIP_LoopAdapter = { - DeviceLen: 8, - Device: "LOOPBACK" + .DeviceLen = 8, + .Device = "LOOPBACK" }; tMutex glIP_Adapters; tAdapter *gIP_Adapters = NULL; @@ -144,28 +144,6 @@ tVFS_Node *IPStack_Root_FindDir(tVFS_Node *Node, const char *Name) return &gIP_LoopInterface.Node; } - #if 0 - i = 0; num = 0; - while('0' <= Name[i] && Name[i] <= '9') - { - num *= 10; - num += Name[i] - '0'; - i ++; - } - if(Name[i] != '\0') { - LEAVE('n'); - return NULL; - } - - for( iface = gIP_Interfaces; iface; iface = iface->Next ) - { - if( (int)iface->Node.ImplInt == num ) - { - LEAVE('p', &iface->Node); - return &iface->Node; - } - } - #else for( iface = gIP_Interfaces; iface; iface = iface->Next ) { if( strcmp(iface->Name, Name) == 0 ) @@ -174,7 +152,6 @@ tVFS_Node *IPStack_Root_FindDir(tVFS_Node *Node, const char *Name) return &iface->Node; } } - #endif LEAVE('p', NULL); return NULL; @@ -192,34 +169,19 @@ int IPStack_Root_IOCtl(tVFS_Node *Node, int ID, void *Data) switch(ID) { // --- Standard IOCtls (0-3) --- - case DRV_IOCTL_TYPE: - LEAVE('i', DRV_TYPE_MISC); - return DRV_TYPE_MISC; - - case DRV_IOCTL_IDENT: - tmp = ModUtil_SetIdent(Data, "IPStack"); - LEAVE('i', 1); - return 1; - - case DRV_IOCTL_VERSION: - LEAVE('x', VERSION); - return VERSION; - - case DRV_IOCTL_LOOKUP: - tmp = ModUtil_LookupString( (char**)casIOCtls_Root, (char*)Data ); - LEAVE('i', tmp); - return tmp; + BASE_IOCTLS(DRV_TYPE_MISC, "IPStack", VERSION, casIOCtls_Root) - /* - * add_interface - * - Adds a new IP interface and binds it to a device - */ + /* + * add_interface + * - Adds a new IP interface and binds it to a device + */ case 4: if( Threads_GetUID() != 0 ) LEAVE_RET('i', -1); if( !CheckString( Data ) ) LEAVE_RET('i', -1); { char name[4] = ""; tInterface *iface = IPStack_AddInterface(Data, name); + if(iface == NULL) LEAVE_RET('i', -1); tmp = iface->Node.ImplInt; } LEAVE_RET('i', tmp); @@ -242,6 +204,7 @@ tInterface *IPStack_AddInterface(const char *Device, const char *Name) card = IPStack_GetAdapter(Device); if( !card ) { + Log_Debug("IPStack", "Unable to open card '%s'", Device); LEAVE('n'); return NULL; // ERR_YOURBAD } @@ -251,9 +214,10 @@ tInterface *IPStack_AddInterface(const char *Device, const char *Name) iface = malloc( sizeof(tInterface) + nameLen + 1 - + IPStack_GetAddressSize(-1) + + IPStack_GetAddressSize(-1)*3 // Address, Route->Network, Route->NextHop ); if(!iface) { + Log_Warning("IPStack", "AddInterface - malloc() failed"); LEAVE('n'); return NULL; // Return ERR_MYBAD } @@ -261,6 +225,8 @@ tInterface *IPStack_AddInterface(const char *Device, const char *Name) iface->Next = NULL; iface->Type = 0; // Unset type iface->Address = iface->Name + nameLen + 1; // Address + iface->Route.Network = iface->Address + IPStack_GetAddressSize(-1); + iface->Route.NextHop = iface->Route.Network + IPStack_GetAddressSize(-1); // Create Node iface->Node.ImplPtr = iface; @@ -280,17 +246,12 @@ tInterface *IPStack_AddInterface(const char *Device, const char *Name) iface->TimeoutDelay = DEFAULT_TIMEOUT; // Get adapter handle - iface->Adapter = IPStack_GetAdapter(Device); - if( !iface->Adapter ) { - free( iface ); - LEAVE('n'); - return NULL; // Return ERR_YOUFAIL - } + iface->Adapter = card; // Delay setting ImplInt until after the adapter is opened // Keeps things simple iface->Node.ImplInt = giIP_NextIfaceId++; - sprintf(iface->Name, "%i", iface->Node.ImplInt); + sprintf(iface->Name, "%i", (int)iface->Node.ImplInt); // Append to list SHORTLOCK( &glIP_Interfaces ); @@ -382,23 +343,7 @@ int IPStack_Iface_IOCtl(tVFS_Node *Node, int ID, void *Data) switch(ID) { // --- Standard IOCtls (0-3) --- - case DRV_IOCTL_TYPE: - LEAVE('i', DRV_TYPE_MISC); - return DRV_TYPE_MISC; - - case DRV_IOCTL_IDENT: - tmp = ModUtil_SetIdent(Data, STR(IDENT)); - LEAVE('i', 1); - return 1; - - case DRV_IOCTL_VERSION: - LEAVE('x', VERSION); - return VERSION; - - case DRV_IOCTL_LOOKUP: - tmp = ModUtil_LookupString( (char**)casIOCtls_Iface, (char*)Data ); - LEAVE('i', tmp); - return tmp; + BASE_IOCTLS(DRV_TYPE_MISC, "IPStack", VERSION, casIOCtls_Iface) /* * getset_type @@ -584,6 +529,7 @@ tAdapter *IPStack_GetAdapter(const char *Path) // Ok, so let's open it dev = malloc( sizeof(tAdapter) + strlen(Path) + 1 ); if(!dev) { + Log_Warning("IPStack", "GetAdapter - malloc() failed"); Mutex_Release( &glIP_Adapters ); LEAVE('n'); return NULL; @@ -607,7 +553,7 @@ tAdapter *IPStack_GetAdapter(const char *Path) tmp = VFS_IOCtl(dev->DeviceFD, 0, NULL); LOG("Device type = %i", tmp); if( tmp != DRV_TYPE_NETWORK ) { - Warning("IPStack_GetAdapter: '%s' is not a network interface", dev->Device); + Log_Warning("IPStack", "IPStack_GetAdapter: '%s' is not a network interface", dev->Device); VFS_Close( dev->DeviceFD ); free( dev ); Mutex_Release( &glIP_Adapters );