Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-07 14:12:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added DynDNS to RS certificate link if available

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6488 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-07-06 20:27:29 +00:00
parent 0c2939734c
commit 9cfce22f88
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
retroshare-gui/src/gui/RetroShareLink.cpp
View file

@ -90,6 +90,7 @@
#define CERTIFICATE_NAME "name" #define CERTIFICATE_NAME "name"
#define CERTIFICATE_EXT_IPPORT "extipp" #define CERTIFICATE_EXT_IPPORT "extipp"
#define CERTIFICATE_LOC_IPPORT "locipp" #define CERTIFICATE_LOC_IPPORT "locipp"
#define CERTIFICATE_DYNDNS "dyndns"
#define PRIVATE_CHAT_TIME_STAMP "time_stamp" #define PRIVATE_CHAT_TIME_STAMP "time_stamp"
#define PRIVATE_CHAT_STRING "encrypted_data" #define PRIVATE_CHAT_STRING "encrypted_data"
@ -289,6 +290,7 @@ void RetroShareLink::fromUrl(const QUrl& url)
_GPGBase64CheckSum = url.queryItemValue(CERTIFICATE_GPG_CHECKSUM); _GPGBase64CheckSum = url.queryItemValue(CERTIFICATE_GPG_CHECKSUM);
_ext_ip_port = url.queryItemValue(CERTIFICATE_EXT_IPPORT); _ext_ip_port = url.queryItemValue(CERTIFICATE_EXT_IPPORT);
_loc_ip_port = url.queryItemValue(CERTIFICATE_LOC_IPPORT); _loc_ip_port = url.queryItemValue(CERTIFICATE_LOC_IPPORT);
_dyndns_name = url.queryItemValue(CERTIFICATE_DYNDNS);
std::cerr << "Got a certificate link!!" << std::endl; std::cerr << "Got a certificate link!!" << std::endl;
check() ; check() ;
return; return;
@ -419,6 +421,7 @@ bool RetroShareLink::createCertificate(const std::string& ssl_or_gpg_id)
_location = QString::fromUtf8(detail.location.c_str()) ; _location = QString::fromUtf8(detail.location.c_str()) ;
_ext_ip_port = QString::fromStdString(detail.extAddr) + ":" + QString::number(detail.extPort) + ";" ; _ext_ip_port = QString::fromStdString(detail.extAddr) + ":" + QString::number(detail.extPort) + ";" ;
_loc_ip_port = QString::fromStdString(detail.localAddr) + ":" + QString::number(detail.localPort) + ";" ; _loc_ip_port = QString::fromStdString(detail.localAddr) + ":" + QString::number(detail.localPort) + ";" ;
_dyndns_name = QString::fromStdString(detail.dyndns);
} }
_name = QString::fromUtf8(detail.name.c_str()) ; _name = QString::fromUtf8(detail.name.c_str()) ;
@ -429,6 +432,7 @@ bool RetroShareLink::createCertificate(const std::string& ssl_or_gpg_id)
std::cerr << "Found Local IP+Port = " << _loc_ip_port.toStdString() << std::endl; std::cerr << "Found Local IP+Port = " << _loc_ip_port.toStdString() << std::endl;
std::cerr << "Found External IP+Port = " << _ext_ip_port.toStdString() << std::endl; std::cerr << "Found External IP+Port = " << _ext_ip_port.toStdString() << std::endl;
std::cerr << "Found Location = " << _location.toStdString() << std::endl; std::cerr << "Found Location = " << _location.toStdString() << std::endl;
std::cerr << "Found DNS = " << _dyndns_name.toStdString() << std::endl;
return true; return true;
} }
@ -686,7 +690,7 @@ QString RetroShareLink::title() const
case TYPE_MESSAGE: case TYPE_MESSAGE:
return PeerDefs::rsidFromId(hash().toStdString()); return PeerDefs::rsidFromId(hash().toStdString());
case TYPE_CERTIFICATE: case TYPE_CERTIFICATE:
return QObject::tr("Click to add this RetroShare cert to your PGP keyring\nand open the Make Friend Wizard.\n") + QString("GPG Id = ") + GPGId() + QString("\nSSLId = ")+SSLId(); return QObject::tr("Click to add this RetroShare cert to your PGP keyring\nand open the Make Friend Wizard.\n") + QString("PGP Id = ") + GPGId() + QString("\nSSLId = ")+SSLId();
} }
return ""; return "";
@ -827,6 +831,9 @@ QString RetroShareLink::toString() const
if (!_ext_ip_port.isEmpty()) { if (!_ext_ip_port.isEmpty()) {
url.addQueryItem(CERTIFICATE_EXT_IPPORT, encodeItem(_ext_ip_port)); url.addQueryItem(CERTIFICATE_EXT_IPPORT, encodeItem(_ext_ip_port));
} }
if (!_dyndns_name.isEmpty()) {
url.addQueryItem(CERTIFICATE_DYNDNS, encodeItem(_dyndns_name));
}
return url.toString(); return url.toString();
} }
@ -1178,6 +1185,8 @@ static void processList(const QStringList &list, const QString &textSingular, co
RS_Certificate += "--EXT--" + link.externalIPAndPort() + ";" ; RS_Certificate += "--EXT--" + link.externalIPAndPort() + ";" ;
if(!link.localIPAndPort().isNull()) if(!link.localIPAndPort().isNull())
RS_Certificate += "--LOCAL--" + link.localIPAndPort() + ";" ; RS_Certificate += "--LOCAL--" + link.localIPAndPort() + ";" ;
if(!link.dyndns().isNull())
RS_Certificate += "--DYNDNS--" + link.dyndns() + ";" ;
RS_Certificate += "\n" ; RS_Certificate += "\n" ;
std::cerr << "Usign this certificate:" << std::endl; std::cerr << "Usign this certificate:" << std::endl;

2
retroshare-gui/src/gui/RetroShareLink.h
View file

@ -95,6 +95,7 @@ class RetroShareLink
const QString& GPGId() const { return _GPGid ; } const QString& GPGId() const { return _GPGid ; }
const QString& localIPAndPort() const { return _loc_ip_port ; } const QString& localIPAndPort() const { return _loc_ip_port ; }
const QString& externalIPAndPort() const { return _ext_ip_port ; } const QString& externalIPAndPort() const { return _ext_ip_port ; }
const QString& dyndns() const { return _dyndns_name ; }
const QString& location() const { return _location ; } const QString& location() const { return _location ; }
time_t timeStamp() const { return _time_stamp ; } time_t timeStamp() const { return _time_stamp ; }
const QString& encryptedPrivateChatInfo() const { return _encrypted_chat_info ; } const QString& encryptedPrivateChatInfo() const { return _encrypted_chat_info ; }
@ -152,6 +153,7 @@ class RetroShareLink
QString _location ; // location QString _location ; // location
QString _ext_ip_port ; QString _ext_ip_port ;
QString _loc_ip_port ; QString _loc_ip_port ;
QString _dyndns_name ;
QString _encrypted_chat_info ; // encrypted data string for the recipient of a chat invite QString _encrypted_chat_info ; // encrypted data string for the recipient of a chat invite
time_t _time_stamp ; // time stamp at which the link will expire. time_t _time_stamp ; // time stamp at which the link will expire.