Skip to content

Commit

Permalink
no message
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomaszmrugalski
tomaszmrugalski committed Feb 1, 2005
1 parent 054da5b commit 470ba88
Show file tree
Hide file tree
Showing 24 changed files with 190 additions and 77 deletions.
18 changes: 11 additions & 7 deletions AddrMgr/AddrIA.cpp
View file
Expand Up @@ -6,9 +6,12 @@
*
* released under GNU GPL v2 or later licence
*
* $Id: AddrIA.cpp,v 1.9 2004-12-03 20:51:42 thomson Exp $
* $Id: AddrIA.cpp,v 1.10 2005-02-01 00:57:36 thomson Exp $
*
* $Log: not supported by cvs2svn $
* Revision 1.9 2004/12/03 20:51:42 thomson
* Logging issues fixed.
*
* Revision 1.8 2004/10/27 22:07:55 thomson
* Signed/unsigned issues fixed, Lifetime option implemented, INFORMATION-REQUEST
* message is now sent properly. Valid lifetime granted by server fixed.
Expand Down Expand Up @@ -355,12 +358,13 @@ enum ETentative TAddrIA::getTentative()
return YES;
case 0:
ptrAddr->setTentative(NO);
Log(Debug) << "DAD finished successfully. Address " << ptrAddr->get()->getPlain()
Log(Debug) << "DAD finished successfully. Address " << ptrAddr->get()->getPlain()
<< " is not tentative." << LogEnd;
break;
default:
Log(Error) << "No such a address on interface "
<< *ptrAddr->get() << LogEnd;
Log(Error) << "DAD inconclusive. Unable to dermine " << ptrAddr->get()->getPlain()
<< " address state. Assuming NOT TENTATIVE." << LogEnd;
ptrAddr->setTentative(NO);
break;
}
}
Expand All @@ -370,10 +374,10 @@ enum ETentative TAddrIA::getTentative()
}
}
if (allChecked) {
this->Tentative = NO;
return NO;
this->Tentative = NO;
return NO;
} else {
return DONTKNOWYET;
return DONTKNOWYET;
}
}

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG
View file
Expand Up @@ -5,6 +5,7 @@
0.4.0 [not-released-yet]
- Relay implemented
- Server now supports relays (bug #70)
- Working directories are not properly stored in the *-CfgMgr.xml files (bug #100)

0.3.1 [2004-12-27] (bugfix release)
- Documenatation (PDF files) now should look ok on all systems
Expand Down
25 changes: 23 additions & 2 deletions CfgMgr/CfgMgr.cpp
View file
Expand Up @@ -6,9 +6,12 @@
*
* released under GNU GPL v2 or later licence
*
* $Id: CfgMgr.cpp,v 1.11 2004-12-02 00:51:04 thomson Exp $
* $Id: CfgMgr.cpp,v 1.12 2005-02-01 00:57:36 thomson Exp $
*
* $Log: not supported by cvs2svn $
* Revision 1.11 2004/12/02 00:51:04 thomson
* Log files are now always created (bugs #34, #36)
*
* Revision 1.10 2004/07/05 00:53:03 thomson
* Various changes.
*
Expand Down Expand Up @@ -209,7 +212,7 @@ bool TCfgMgr::setDUID(const string filename) {
realIface->getMacLen(), realIface->getHardwareType());
}

Log(Crit) << "Cannot generate DUID, because I cannot find interface with "
Log(Crit) << "Cannot generate DUID, because there is no up and running interface with "
<< "MAC address at least 6 bytes long." << LogEnd;
this->DUID=new TDUID();
return false;
Expand Down Expand Up @@ -248,6 +251,24 @@ bool TCfgMgr::generateDUID(const string duidFile,char * mac,int macLen, int macT
return true;
}

void TCfgMgr::setWorkdir(std::string workdir) {
this->Workdir = workdir;
}

string TCfgMgr::getWorkDir() {
return Workdir;
}

string TCfgMgr::getLogName()
{
return LogName;
}

int TCfgMgr::getLogLevel()
{
return LogLevel;
}

SmartPtr<TDUID> TCfgMgr::getDUID()
{
return DUID;
Expand Down
11 changes: 9 additions & 2 deletions CfgMgr/CfgMgr.h
View file
Expand Up @@ -6,9 +6,12 @@
*
* released under GNU GPL v2 or later licence
*
* $Id: CfgMgr.h,v 1.5 2004-07-05 00:53:03 thomson Exp $
* $Id: CfgMgr.h,v 1.6 2005-02-01 00:57:36 thomson Exp $
*
* $Log: not supported by cvs2svn $
* Revision 1.5 2004/07/05 00:53:03 thomson
* Various changes.
*
* Revision 1.4 2004/07/01 18:12:12 thomson
* DUID creation failure results in client/server shutdown (bugs #44, #45)
*
Expand Down Expand Up @@ -39,13 +42,17 @@ class TCfgMgr
bool compareConfigs(const string cfgFile, const string oldCfgFile);
void copyFile(const string cfgFile, const string oldCfgFile);
SmartPtr<TDUID> getDUID();
void setWorkdir(std::string workdir);
int getLogLevel();
string getWorkDir();
string getLogName();

protected:
SmartPtr<TDUID> DUID;
bool setDUID(const string duidFile);
bool loadDUID(const string filename);
bool generateDUID(const string duidFile,char * mac,int macLen, int macType);
string WorkDir;
string Workdir;
string LogName;
int LogLevel;
bool IsDone;
Expand Down
31 changes: 10 additions & 21 deletions ClntCfgMgr/ClntCfgMgr.cpp
View file
Expand Up @@ -6,9 +6,12 @@
*
* released under GNU GPL v2 or later licence
*
* $Id: ClntCfgMgr.cpp,v 1.29 2005-01-13 22:45:55 thomson Exp $
* $Id: ClntCfgMgr.cpp,v 1.30 2005-02-01 00:57:36 thomson Exp $
*
* $Log: not supported by cvs2svn $
* Revision 1.29 2005/01/13 22:45:55 thomson
* Relays implemented.
*
* Revision 1.28 2004/12/27 20:48:22 thomson
* Problem with absent link local addresses fixed (bugs #90, #91)
*
Expand Down Expand Up @@ -95,6 +98,9 @@ TClntCfgMgr::TClntCfgMgr(SmartPtr<TClntIfaceMgr> ClntIfaceMgr,
Log(Debug) << "Parsing " << cfgFile << " done." << LogEnd;
f.close();

this->LogLevel = logger::getLogLevel();
this->LogName = logger::getLogName();

if (result) {
//Result!=0 means config errors. Finish whole DHCPClient
Log(Crit) << "Fatal error during config parsing." << LogEnd;
Expand All @@ -105,8 +111,6 @@ TClntCfgMgr::TClntCfgMgr(SmartPtr<TClntIfaceMgr> ClntIfaceMgr,

// match parsed interfaces with interfaces detected in system
matchParsedSystemInterfaces(&parser);

this->WorkDir = parser.ParserOptStack.getLast()->getWorkDir();

// check config consistency
if(!validateConfig()) {
Expand All @@ -115,7 +119,7 @@ TClntCfgMgr::TClntCfgMgr(SmartPtr<TClntIfaceMgr> ClntIfaceMgr,
}

// load or create DUID
string duidFile = this->WorkDir+"/"+(string)CLNTDUID_FILE;
string duidFile = (string)CLNTDUID_FILE;
if (!setDUID(duidFile)) {
this->IsDone=true;
return;
Expand Down Expand Up @@ -266,27 +270,12 @@ int TClntCfgMgr::countIfaces()
return ClntCfgIfaceLst.count();
}

string TClntCfgMgr::getWorkDir()
{
return WorkDir;
}

bool TClntCfgMgr::getReconfigure()
{
//FIXME
return false;
}

string TClntCfgMgr::getLogName()
{
return LogName;
}

int TClntCfgMgr::getLogLevel()
{
return LogLevel;
}

int TClntCfgMgr::countAddrForIA(long IAID)
{
SmartPtr<TClntCfgIface> ptrIface;
Expand Down Expand Up @@ -508,10 +497,10 @@ TClntCfgMgr::~TClntCfgMgr() {
ostream & operator<<(ostream &strum, TClntCfgMgr &x)
{
strum << "<ClntCfgMgr>" << endl;
strum << " " << *x.DUID;
strum << " <WorkDir>" << x.getWorkDir() << "</WorkDir>" << endl;
strum << " <workdir>" << x.getWorkDir() << "</workdir>" << endl;
strum << " <LogName>" << x.getLogName() << "</LogName>" << endl;
strum << " <LogLevel>" << x.getLogLevel() << "</LogLevel>" << endl;
strum << " " << *x.DUID;

SmartPtr<TClntCfgIface> ptr;
x.firstIface();
Expand Down
8 changes: 4 additions & 4 deletions ClntCfgMgr/ClntCfgMgr.h
View file
Expand Up @@ -6,9 +6,12 @@
*
* released under GNU GPL v2 or later licence
*
* $Id: ClntCfgMgr.h,v 1.7 2004-12-07 20:51:35 thomson Exp $
* $Id: ClntCfgMgr.h,v 1.8 2005-02-01 00:57:36 thomson Exp $
*
* $Log: not supported by cvs2svn $
* Revision 1.7 2004/12/07 20:51:35 thomson
* Link local safety checks added (bug #39)
*
* Revision 1.6 2004/12/07 00:45:41 thomson
* Clnt managers creation unified and cleaned up.
*
Expand Down Expand Up @@ -53,10 +56,7 @@ class TClntCfgMgr : public TCfgMgr
int countIfaces();
void dump();

string getWorkDir();
bool getReconfigure();
string getLogName();
int getLogLevel();

//IA related
bool setIAState(int iface, int iaid, enum EState state);
Expand Down
15 changes: 10 additions & 5 deletions Misc/DHCPClient.cpp
View file
Expand Up @@ -6,9 +6,12 @@
*
* released under GNU GPL v2 or later licence
*
* $Id: DHCPClient.cpp,v 1.19 2005-01-08 16:52:04 thomson Exp $
* $Id: DHCPClient.cpp,v 1.20 2005-02-01 00:57:36 thomson Exp $
*
* $Log: not supported by cvs2svn $
* Revision 1.19 2005/01/08 16:52:04 thomson
* Relay support implemented.
*
* Revision 1.18 2004/12/07 22:56:20 thomson
* Typo corrected.
*
Expand Down Expand Up @@ -55,10 +58,6 @@

volatile int serviceShutdown;

//static void foo() {
// SmartPtr<TClntParsGlobalOpt> opt = new TClntParsGlobalOpt();
//}

TDHCPClient::TDHCPClient(string config)
{
serviceShutdown = 0;
Expand Down Expand Up @@ -157,6 +156,12 @@ bool TDHCPClient::checkPrivileges() {
return true;
}

void TDHCPClient::setWorkdir(std::string workdir) {
if (this->CfgMgr)
this->CfgMgr->setWorkdir(workdir);
this->CfgMgr->dump();
}

TDHCPClient::~TDHCPClient()
{
}
6 changes: 5 additions & 1 deletion Misc/DHCPClient.h
View file
Expand Up @@ -6,9 +6,12 @@
*
* released under GNU GPL v2 or later licence
*
* $Id: DHCPClient.h,v 1.3 2004-12-07 00:45:41 thomson Exp $
* $Id: DHCPClient.h,v 1.4 2005-02-01 00:57:36 thomson Exp $
*
* $Log: not supported by cvs2svn $
* Revision 1.3 2004/12/07 00:45:41 thomson
* Clnt managers creation unified and cleaned up.
*
* Revision 1.2 2004/06/20 19:29:23 thomson
* New address assignment finally works.
*
Expand Down Expand Up @@ -36,6 +39,7 @@ class TDHCPClient
void stop();
bool isDone();
bool checkPrivileges();
void setWorkdir(std::string workdir);

~TDHCPClient();

Expand Down
11 changes: 10 additions & 1 deletion Misc/DHCPRelay.cpp
View file
Expand Up @@ -6,9 +6,12 @@
*
* released under GNU GPL v2 licence
*
* $Id: DHCPRelay.cpp,v 1.2 2005-01-13 22:45:55 thomson Exp $
* $Id: DHCPRelay.cpp,v 1.3 2005-02-01 00:57:36 thomson Exp $
*
* $Log: not supported by cvs2svn $
* Revision 1.2 2005/01/13 22:45:55 thomson
* Relays implemented.
*
* Revision 1.1 2005/01/11 22:53:35 thomson
* Relay skeleton implemented.
*
Expand Down Expand Up @@ -121,6 +124,12 @@ void TDHCPRelay::stop() {

}

void TDHCPRelay::setWorkdir(std::string workdir) {
if (this->Ctx.CfgMgr)
this->Ctx.CfgMgr->setWorkdir(workdir);
this->Ctx.CfgMgr->dump();
}

TDHCPRelay::~TDHCPRelay() {
}

6 changes: 5 additions & 1 deletion Misc/DHCPRelay.h
View file
Expand Up @@ -6,9 +6,12 @@
*
* released under GNU GPL v2 licence
*
* $Id: DHCPRelay.h,v 1.1 2005-01-11 22:53:35 thomson Exp $
* $Id: DHCPRelay.h,v 1.2 2005-02-01 00:57:36 thomson Exp $
*
* $Log: not supported by cvs2svn $
* Revision 1.1 2005/01/11 22:53:35 thomson
* Relay skeleton implemented.
*
*/

#ifndef DHCPSERVER_H
Expand All @@ -28,6 +31,7 @@ class TDHCPRelay
void stop();
bool isDone();
bool checkPrivileges();
void setWorkdir(std::string workdir);
~TDHCPRelay();

private:
Expand Down
11 changes: 10 additions & 1 deletion Misc/DHCPServer.cpp
View file
Expand Up @@ -6,9 +6,12 @@
*
* released under GNU GPL v2 licence
*
* $Id: DHCPServer.cpp,v 1.21 2005-01-11 22:53:35 thomson Exp $
* $Id: DHCPServer.cpp,v 1.22 2005-02-01 00:57:36 thomson Exp $
*
* $Log: not supported by cvs2svn $
* Revision 1.21 2005/01/11 22:53:35 thomson
* Relay skeleton implemented.
*
* Revision 1.20 2005/01/08 16:52:04 thomson
* Relay support implemented.
*
Expand Down Expand Up @@ -172,6 +175,12 @@ void TDHCPServer::stop() {

}

void TDHCPServer::setWorkdir(std::string workdir) {
if (this->CfgMgr)
this->CfgMgr->setWorkdir(workdir);
this->CfgMgr->dump();
}

TDHCPServer::~TDHCPServer()
{
}
Expand Down
1 change: 1 addition & 0 deletions Misc/DHCPServer.h
View file
Expand Up @@ -16,6 +16,7 @@ class TDHCPServer
void stop();
bool isDone();
bool checkPrivileges();
void setWorkdir(std::string workdir);
~TDHCPServer();

private:
Expand Down

0 comments on commit 470ba88

Please sign in to comment.