Diffstat (limited to 'noncore/settings/networksettings2/nsdata.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/nsdata.cpp | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp index 39031ed..b4622fc 100644 --- a/noncore/settings/networksettings2/nsdata.cpp +++ b/noncore/settings/networksettings2/nsdata.cpp @@ -41,32 +41,32 @@ NetworkSettingsData::NetworkSettingsData( void ) { Log(( "System reports %d interfaces. Found %d up\n", NSResources->system().interfaces().count(), SL.count() )); for ( QStringList::Iterator it = SL.begin(); it != SL.end(); ++it ) { profilenr = atol( (*it).mid( 8 ).latin1() ); // read the interface store int 'up' F->setName( D.path() + "/" + (*it) ); if( F->open( IO_ReadOnly ) ) { - NodeCollection * NC; + NetworkSetup * NC; interfacename = TS.readLine(); F->close(); Log(( "Assign interface %s to Profile nr %d\n", interfacename.latin1(), profilenr )); - NC = NSResources->getConnection( profilenr ); + NC = NSResources->getNetworkSetup( profilenr ); if( NC ) { NC->assignInterface( NSResources->system().findInterface( interfacename ) ); Log(( "Assign interface %p\n", NC->assignedInterface() )); } else { Log(( "Profile nr %d no longer defined\n", profilenr )); } } } } @@ -90,46 +90,46 @@ void NetworkSettingsData::loadSettings( void ) { do { if( ! F.open(IO_ReadOnly) ) break; /* load the file -> FORMAT : [NETNODETYPE] Entries ... <EMPTYLINE> - [connection] + [NetworkSetup] Name=Name Node=Name <EMPTYLINE> */ while( ! TS.atEnd() ) { S = Line = TS.readLine(); if ( S.isEmpty() || S[0] != '[' ) continue; S = S.mid( 1, S.length()-2 ); if( ! NSResources ) { continue; } - if( S == "connection" ) { - // load connections -> collections of nodes + if( S == "NetworkSetup" ) { + // load NetworkSetups -> collections of nodes bool Dangling; - NodeCollection * NC = new NodeCollection( TS, Dangling ); - NSResources->addConnection( NC, Dangling ); + NetworkSetup * NC = new NetworkSetup( TS, Dangling ); + NSResources->addNetworkSetup( NC, Dangling ); } else { ANetNode * NN = 0; ANetNodeInstance* NNI = 0; if( S.startsWith( "nodetype " ) ) { S = S.mid( 9, S.length()-9 ); S = deQuote(S); // try to find netnode NN = NSResources->findNetNode( S ); } else { // try to find instance NNI = NSResources->createNodeInstance( S ); } @@ -242,70 +242,70 @@ QString NetworkSettingsData::saveSettings( void ) { ++nit ) { // header NNI = nit.current(); TS << '[' << QString(NNI->nodeClass()->name()) << ']' << endl; NNI->saveAttributes( TS ); TS << endl; } } - // good connections - { Name2Connection_t & M = NSResources->connections(); + // good NetworkSetups + { Name2NetworkSetup_t & M = NSResources->networkSetups(); - // for all connections - for( QDictIterator<NodeCollection> it(M); + // for all NetworkSetups + for( QDictIterator<NetworkSetup> it(M); it.current(); ++it ) { - TS << "[connection]" << endl; + TS << "[NetworkSetup]" << endl; it.current()->save(TS); } } - // save dangling connections - { Name2Connection_t & M = NSResources->danglingConnections(); + // save dangling NetworkSetups + { Name2NetworkSetup_t & M = NSResources->danglingNetworkSetups(); - // for all connections - for( QDictIterator<NodeCollection> it(M); + // for all NetworkSetups + for( QDictIterator<NetworkSetup> it(M); it.current(); ++it ) { - TS << "[connection]" << endl; + TS << "[NetworkSetup]" << endl; it.current()->save(TS); } } QDir D("."); D.rename( CfgFile + ".bup", CfgFile ); // // proper files AND system files regenerated // - for( QDictIterator<NodeCollection> it(NSResources->connections()); + for( QDictIterator<NetworkSetup> it(NSResources->networkSetups()); it.current(); ++it ) { it.current()->setModified( 0 ); } return ErrS; } QString NetworkSettingsData::generateSettings( void ) { QString S = ""; Name2SystemFile_t & SFM = NSResources->systemFiles(); - Name2Connection_t & M = NSResources->connections(); - NodeCollection * NC; + Name2NetworkSetup_t & M = NSResources->networkSetups(); + NetworkSetup * NC; ANetNodeInstance * NNI; ANetNodeInstance * FirstWithData; RuntimeInfo * CurDev; ANetNode * NN, * CurDevNN = 0; long NoOfDevs; long DevCtStart; bool needToGenerate; // regenerate system files Log( ( "Generating settings from %s\n", CfgFile.latin1() )); for( QDictIterator<ANetNode> nnit( NSResources->netNodes() ); @@ -419,25 +419,25 @@ QString NetworkSettingsData::generateSettings( void ) { nnit.current(); ++nnit ) { nnit.current()->setDone(0); } for( QDictIterator<ANetNodeInstance> nniit( NSResources->netNodeInstances() ); nniit.current(); ++nniit ) { nniit.current()->setDone(0); } - for( QDictIterator<NodeCollection> ncit(M); + for( QDictIterator<NetworkSetup> ncit(M); ncit.current(); ++ncit ) { ncit.current()->setDone(0); } Log( ( "Generating system file %s\n", SF->name().latin1() )); needToGenerate = 0; // are there netnodes that have instances and need // to write data in this system file ? for( QDictIterator<ANetNode> nnit( NSResources->netNodes() ); @@ -479,47 +479,47 @@ QString NetworkSettingsData::generateSettings( void ) { arg( SF->name() ); return S; } // global presection for this system file if( ! SF->preSection() ) { S = qApp->translate( "NetworkSettings", "<p>Error in section \"Preamble\" for file \"%1\"</p>" ). arg( SF->name() ); return S; } - // find connections that want to write to this file - for( QDictIterator<NodeCollection> ncit(M); + // find NetworkSetups that want to write to this file + for( QDictIterator<NetworkSetup> ncit(M); ncit.current(); ++ncit ) { NC = ncit.current(); if( NC->done() ) { // already done continue; } if( ! NC->hasDataForFile( *SF ) ) { // no data continue; } - Log(("Generating %s for connection %s\n", + Log(("Generating %s for NetworkSetup %s\n", SF->name().latin1(), NC->name().latin1() )); // find highest item that wants to write data to this file FirstWithData = NC->firstWithDataForFile( *SF ); - // find device on which this connection works + // find device on which this NetworkSetup works CurDev = NC->device(); // class of that node CurDevNN = CurDev->netNode()->nodeClass(); if( ! FirstWithData->nodeClass()->done() ) { // generate fixed part if( ! SF->preDeviceSection( CurDevNN ) ) { S = qApp->translate( "NetworkSettings", "<p>Error in section \"Pre-Device\" for file \"%1\"</p>" ). arg( SF->name() ); return S; } @@ -562,35 +562,35 @@ QString NetworkSettingsData::generateSettings( void ) { return S; } } CurDev->netNode()->nodeClass()->setDone( 1 ); Log(( "Systemfile %s for Nodeclass %s is done\n", SF->name().latin1(), CurDev->netNode()->nodeClass()->name() )); } // generate profile specific info - // for all nodeconnections that work on the same device - for( QDictIterator<NodeCollection> ncit2(M); + // for all nodeNetworkSetups that work on the same device + for( QDictIterator<NetworkSetup> ncit2(M); ncit2.current(); ++ncit2 ) { if( ncit2.current()->device() != CurDev ) { // different device continue; } - Log(("Connection %s of family %s\n", + Log(("NetworkSetup %s of family %s\n", ncit2.current()->name().latin1(), CurDev->name() )); // generate NNI = ncit2.current()->firstWithDataForFile( *SF ); for( int i = DevCtStart; i < NoOfDevs ; i ++ ) { if( ! SF->preNodeSection( NNI, i ) ) { S = qApp->translate( "NetworkSettings", "<p>Error in \"Pre-Node Part\" for file \"%1\" and node \"%2\"</p>" ). arg( SF->name() ). arg( CurDevNN->name() ); return S; } @@ -636,70 +636,70 @@ QString NetworkSettingsData::generateSettings( void ) { S = qApp->translate( "NetworkSettings", "<p>Error in section \"Closure\" for file \"%1\"</p>" ). arg( SF->name() ); return S; } // end of file SF->close(); } return S; } -QList<NodeCollection> NetworkSettingsData::collectPossible( +QList<NetworkSetup> NetworkSettingsData::collectPossible( const QString & Interface ) { - // collect connections that can work on top of this interface - NodeCollection * NC; - QList<NodeCollection> PossibleConnections; - Name2Connection_t & M = NSResources->connections(); + // collect NetworkSetups that can work on top of this interface + NetworkSetup * NC; + QList<NetworkSetup> PossibleNetworkSetups; + Name2NetworkSetup_t & M = NSResources->networkSetups(); - // for all connections - for( QDictIterator<NodeCollection> it(M); + // for all NetworkSetups + for( QDictIterator<NetworkSetup> it(M); it.current(); ++it ) { NC = it.current(); // check if this profile handles the requested interface if( NC->handlesInterface( Interface ) && // if different Intf. NC->state() != Disabled && // if enabled NC->state() != IsUp // if already used ) { Log( ( "Append %s for %s\n", NC->name().latin1(), Interface.latin1() )); - PossibleConnections.append( NC ); + PossibleNetworkSetups.append( NC ); } } - return PossibleConnections; + return PossibleNetworkSetups; } /* Called by the system to see if interface can be brought UP if allowed, echo Interface-allowed else Interface-disallowed */ bool NetworkSettingsData::canStart( const QString & Interface ) { // load situation - NodeCollection * NC = 0; - QList<NodeCollection> PossibleConnections; + NetworkSetup * NC = 0; + QList<NetworkSetup> PossibleNetworkSetups; - PossibleConnections = collectPossible( Interface ); + PossibleNetworkSetups = collectPossible( Interface ); Log( ( "for %s : Possiblilies %d\n", - Interface.latin1(), PossibleConnections.count() )); - switch( PossibleConnections.count() ) { - case 0 : // no connections + Interface.latin1(), PossibleNetworkSetups.count() )); + switch( PossibleNetworkSetups.count() ) { + case 0 : // no NetworkSetups break; - case 1 : // one connection - NC = PossibleConnections.first(); + case 1 : // one NetworkSetup + NC = PossibleNetworkSetups.first(); break; default : // need to ask user ? return 1; } if( NC ) { switch( NC->state() ) { case Unchecked : case Unknown : case Unavailable : case Disabled : // this profile does not allow interface to be UP @@ -727,57 +727,57 @@ bool NetworkSettingsData::canStart( const QString & Interface ) { } // if we come here no alternatives are possible Log(( "disallow %s\n", Interface.latin1())); printf( "D-%s\n", Interface.latin1() ); return 0; } bool NetworkSettingsData::isModified( void ) { if( ForceModified ) return 1; - for( QDictIterator<NodeCollection> it(NSResources->connections()); + for( QDictIterator<NetworkSetup> it(NSResources->networkSetups()); it.current(); ++it ) { if( it.current()->isModified() ) { return 1; } } return 0; } bool NetworkSettingsData::couldBeTriggered( const QString & Interface ) { // load situation - QList<NodeCollection> PossibleTriggered; + QList<NetworkSetup> PossibleTriggered; PossibleTriggered = collectTriggered( Interface ); Log( ( "for %s : Possiblilies %d\n", Interface.latin1(), PossibleTriggered.count() )); return ( PossibleTriggered.count() ) ? 1 : 0; } -QList<NodeCollection> NetworkSettingsData::collectTriggered( +QList<NetworkSetup> NetworkSettingsData::collectTriggered( const QString & Interface ) { - // collect connections that could be triggered by this interface - NodeCollection * NC; - QList<NodeCollection> PossibleTriggered; + // collect NetworkSetups that could be triggered by this interface + NetworkSetup * NC; + QList<NetworkSetup> PossibleTriggered; - // for all connections - Name2Connection_t & M = NSResources->connections(); + // for all NetworkSetups + Name2NetworkSetup_t & M = NSResources->networkSetups(); - for( QDictIterator<NodeCollection> it(M); + for( QDictIterator<NetworkSetup> it(M); it.current(); ++it ) { NC = it.current(); // check if this profile handles the requested interface if( NC->triggeredBy( Interface ) && // if different Intf. NC->state() != Disabled && // if enabled NC->state() != IsUp // if already used ) { Log( ( "Append %s for %s\n", NC->name().latin1(), Interface.latin1() )); PossibleTriggered.append( NC ); } |