L->AllowMask = tag->getString("allowmask");
L->IPAddr = tag->getString("ipaddr");
L->Port = tag->getInt("port");
- L->SendPass = tag->getString("sendpass");
- L->RecvPass = tag->getString("recvpass");
+ L->SendPass = tag->getString("sendpass", tag->getString("password"));
+ L->RecvPass = tag->getString("recvpass", tag->getString("password"));
L->Fingerprint = tag->getString("fingerprint");
L->HiddenFromStats = tag->getBool("statshidden");
L->Timeout = tag->getInt("timeout");
if (L->Name.length() > 64)
throw CoreException("The link name '"+assign(L->Name)+"' is longer than 64 characters!");
+ if (L->Fingerprint.find(':') != std::string::npos)
+ {
+ std::string tmp = L->Fingerprint;
+ L->Fingerprint.clear();
+ for(unsigned int j=0; j < tmp.length(); j++)
+ if (tmp[j] != ':')
+ L->Fingerprint.push_back(tmp[j]);
+ }
+
if ((!L->IPAddr.empty()) && (!L->RecvPass.empty()) && (!L->SendPass.empty()) && (!L->Name.empty()) && (L->Port))
{
ValidIPs.push_back(L->IPAddr);