Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 23:49:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

patch from Henry morgan to fix soem typos (e.g misspelled connexion into connection)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-06-24 21:23:50 +00:00
parent 748f7db7a4
commit 4868a90d81
10 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/ft/ftfilecreator.cc
View File

@ -317,7 +317,7 @@ int ftFileCreator::locked_notifyReceived(uint64_t offset, uint32_t chunk_size)
{ {
// Chunk is not found. Maybe that is because the packet is in the middle // Chunk is not found. Maybe that is because the packet is in the middle
// of an existing chunk. This case occurs whenever a packet is lost due // of an existing chunk. This case occurs whenever a packet is lost due
// to temporarily interrupted connexion. In such a case we split the // to temporarily interrupted connection. In such a case we split the
// chunk. Any pending block will be re-asked to the source after 40 secs. // chunk. Any pending block will be re-asked to the source after 40 secs.
// //
#ifdef FILE_DEBUG #ifdef FILE_DEBUG

2
libretroshare/src/pqi/authssl.cc
View File

@ -1296,7 +1296,7 @@ bool AuthSSLimpl::decrypt(void *&out, int &outlen, const void *in, int inlen)
void AuthSSLimpl::setCurrentConnectionAttemptInfo(const std::string& gpg_id,const std::string& ssl_id,const std::string& ssl_cn) void AuthSSLimpl::setCurrentConnectionAttemptInfo(const std::string& gpg_id,const std::string& ssl_id,const std::string& ssl_cn)
{ {
#ifdef AUTHSSL_DEBUG #ifdef AUTHSSL_DEBUG
std::cerr << "AuthSSL: registering connexion attempt from:" << std::endl; std::cerr << "AuthSSL: registering connection attempt from:" << std::endl;
std::cerr << " GPG id: " << gpg_id << std::endl; std::cerr << " GPG id: " << gpg_id << std::endl;
std::cerr << " SSL id: " << ssl_id << std::endl; std::cerr << " SSL id: " << ssl_id << std::endl;
std::cerr << " SSL cn: " << ssl_cn << std::endl; std::cerr << " SSL cn: " << ssl_cn << std::endl;

2
libretroshare/src/pqi/pqissl.cc
View File

@ -1613,7 +1613,7 @@ int pqissl::readdata(void *data, int len)
{ {
// SSL_WANT_READ is not a crittical error. It's just a sign that // SSL_WANT_READ is not a crittical error. It's just a sign that
// the internal SSL buffer is not ready to accept more data. So -1 // the internal SSL buffer is not ready to accept more data. So -1
// is returned, and the connexion will be retried as is on next // is returned, and the connection will be retried as is on next
// call of readdata(). // call of readdata().
#ifdef PQISSL_DEBUG #ifdef PQISSL_DEBUG

4
libretroshare/src/pqi/pqissllistener.cc
View File

@ -381,13 +381,13 @@ int pqissllistenbase::continueSSL(IncomingSSLInfo& incoming_connexion_info, bool
// attempt the accept again. // attempt the accept again.
int fd = SSL_get_fd(incoming_connexion_info.ssl); int fd = SSL_get_fd(incoming_connexion_info.ssl);
// clear the connexion info that will be filled in by the callback. // clear the connection info that will be filled in by the callback.
// //
AuthSSL::getAuthSSL()->setCurrentConnectionAttemptInfo(std::string(),std::string(),std::string()) ; AuthSSL::getAuthSSL()->setCurrentConnectionAttemptInfo(std::string(),std::string(),std::string()) ;
int err = SSL_accept(incoming_connexion_info.ssl); int err = SSL_accept(incoming_connexion_info.ssl);
// No grab the connexion info that was filled in by the callback. // No grab the connection info that was filled in by the callback.
// //
AuthSSL::getAuthSSL()->getCurrentConnectionAttemptInfo(incoming_connexion_info.gpgid,incoming_connexion_info.sslid,incoming_connexion_info.sslcn) ; AuthSSL::getAuthSSL()->getCurrentConnectionAttemptInfo(incoming_connexion_info.gpgid,incoming_connexion_info.sslid,incoming_connexion_info.sslcn) ;

2
libretroshare/src/retroshare/rsmsgs.h
View File

@ -73,7 +73,7 @@
#define RS_MSGTAGTYPE_LATER 5 #define RS_MSGTAGTYPE_LATER 5
#define RS_MSGTAGTYPE_USER 100 #define RS_MSGTAGTYPE_USER 100
#define RS_CHAT_LOBBY_PRIVACY_LEVEL_CHALLENGE 0 /* Used to accept connexion challenges only. */ #define RS_CHAT_LOBBY_PRIVACY_LEVEL_CHALLENGE 0 /* Used to accept connection challenges only. */
#define RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC 1 /* lobby is visible by friends. Friends can connect.*/ #define RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC 1 /* lobby is visible by friends. Friends can connect.*/
#define RS_CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE 2 /* lobby invisible by friends. Peers on invitation only .*/ #define RS_CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE 2 /* lobby invisible by friends. Peers on invitation only .*/

14
libretroshare/src/services/p3chatservice.cc
View File

@ -50,9 +50,9 @@
* #define DEBUG_DISTANT_CHAT 1 * #define DEBUG_DISTANT_CHAT 1
****/ ****/
static const int CONNECTION_CHALLENGE_MAX_COUNT = 20 ; // sends a connexion challenge every 20 messages static const int CONNECTION_CHALLENGE_MAX_COUNT = 20 ; // sends a connection challenge every 20 messages
static const time_t CONNECTION_CHALLENGE_MAX_MSG_AGE = 30 ; // maximum age of a message to be used in a connexion challenge static const time_t CONNECTION_CHALLENGE_MAX_MSG_AGE = 30 ; // maximum age of a message to be used in a connection challenge
static const int CONNECTION_CHALLENGE_MIN_DELAY = 15 ; // sends a connexion at most every 15 seconds static const int CONNECTION_CHALLENGE_MIN_DELAY = 15 ; // sends a connection at most every 15 seconds
static const int LOBBY_CACHE_CLEANING_PERIOD = 10 ; // clean lobby caches every 10 secs (remove old messages) static const int LOBBY_CACHE_CLEANING_PERIOD = 10 ; // clean lobby caches every 10 secs (remove old messages)
static const time_t MAX_KEEP_MSG_RECORD = 1200 ; // keep msg record for 1200 secs max. static const time_t MAX_KEEP_MSG_RECORD = 1200 ; // keep msg record for 1200 secs max.
static const time_t MAX_KEEP_INACTIVE_NICKNAME = 180 ; // keep inactive nicknames for 3 mn max. static const time_t MAX_KEEP_INACTIVE_NICKNAME = 180 ; // keep inactive nicknames for 3 mn max.
@ -2129,7 +2129,7 @@ void p3ChatService::handleConnectionChallenge(RsChatLobbyConnectChallengeItem *i
// Look into message cache of all lobbys to handle the challenge. // Look into message cache of all lobbys to handle the challenge.
// //
#ifdef CHAT_DEBUG #ifdef CHAT_DEBUG
std::cerr << "p3ChatService::handleConnectionChallenge(): received connexion challenge:" << std::endl; std::cerr << "p3ChatService::handleConnectionChallenge(): received connection challenge:" << std::endl;
std::cerr << " Challenge code = 0x" << std::hex << item->challenge_code << std::dec << std::endl; std::cerr << " Challenge code = 0x" << std::hex << item->challenge_code << std::dec << std::endl;
std::cerr << " Peer Id = " << item->PeerId() << std::endl; std::cerr << " Peer Id = " << item->PeerId() << std::endl;
#endif #endif
@ -2263,7 +2263,7 @@ void p3ChatService::invitePeerToLobby(const ChatLobbyId& lobby_id, const std::st
{ {
#ifdef CHAT_DEBUG #ifdef CHAT_DEBUG
if(connexion_challenge) if(connexion_challenge)
std::cerr << "Sending connexion challenge accept to peer " << peer_id << " for lobby "<< std::hex << lobby_id << std::dec << std::endl; std::cerr << "Sending connection challenge accept to peer " << peer_id << " for lobby "<< std::hex << lobby_id << std::dec << std::endl;
else else
std::cerr << "Sending invitation to peer " << peer_id << " to lobby "<< std::hex << lobby_id << std::dec << std::endl; std::cerr << "Sending invitation to peer " << peer_id << " to lobby "<< std::hex << lobby_id << std::dec << std::endl;
#endif #endif
@ -2810,7 +2810,7 @@ void p3ChatService::cleanLobbyCaches()
it->second.last_keep_alive_packet_time = now ; it->second.last_keep_alive_packet_time = now ;
} }
// 4 - look at lobby activity and possibly send connexion challenge // 4 - look at lobby activity and possibly send connection challenge
// //
if(++it->second.connexion_challenge_count > CONNECTION_CHALLENGE_MAX_COUNT && now > it->second.last_connexion_challenge_time + CONNECTION_CHALLENGE_MIN_DELAY) if(++it->second.connexion_challenge_count > CONNECTION_CHALLENGE_MAX_COUNT && now > it->second.last_connexion_challenge_time + CONNECTION_CHALLENGE_MIN_DELAY)
{ {
@ -2847,7 +2847,7 @@ void p3ChatService::cleanLobbyCaches()
for(std::list<ChatLobbyId>::const_iterator it(changed_lobbies.begin());it!=changed_lobbies.end();++it) for(std::list<ChatLobbyId>::const_iterator it(changed_lobbies.begin());it!=changed_lobbies.end();++it)
rsicontrol->getNotify().notifyChatLobbyEvent(*it,RS_CHAT_LOBBY_EVENT_KEEP_ALIVE,"------------","") ; rsicontrol->getNotify().notifyChatLobbyEvent(*it,RS_CHAT_LOBBY_EVENT_KEEP_ALIVE,"------------","") ;
// send connexion challenges // send connection challenges
// //
for(std::list<ChatLobbyId>::const_iterator it(send_challenge_lobbies.begin());it!=send_challenge_lobbies.end();++it) for(std::list<ChatLobbyId>::const_iterator it(send_challenge_lobbies.begin());it!=send_challenge_lobbies.end();++it)
sendConnectionChallenge(*it) ; sendConnectionChallenge(*it) ;

2
libretroshare/src/turtle/p3turtle.h
View File

@ -61,7 +61,7 @@
// the correct peers, selecting randomly among all the possible tunnels for this hash. // the correct peers, selecting randomly among all the possible tunnels for this hash.
// 5 - when a file data packet gets back, the turtle router forwards it back to the file transfer module. // 5 - when a file data packet gets back, the turtle router forwards it back to the file transfer module.
// //
//================================ connexion to the file transfer module ===============================// //================================ connection to the file transfer module ===============================//
// //
// The turtle router should provide the ft module with the necessary interface for asking files, and // The turtle router should provide the ft module with the necessary interface for asking files, and
// retreiving data: // retreiving data:

6
libretroshare/src/util/extaddrfinder.cc
View File

@ -83,16 +83,16 @@ static void getPage(const std::string& server_name,std::string& page)
serveur.sin_port = htons(80); serveur.sin_port = htons(80);
#ifdef EXTADDRSEARCH_DEBUG #ifdef EXTADDRSEARCH_DEBUG
printf("Connexion attempt\n"); printf("Connection attempt\n");
#endif #endif
if(unix_connect(sockfd,(struct sockaddr *)&serveur, sizeof(serveur)) == -1) if(unix_connect(sockfd,(struct sockaddr *)&serveur, sizeof(serveur)) == -1)
{ {
std::cerr << "ExtAddrFinder: Connexion error to " << server_name << std::endl ; std::cerr << "ExtAddrFinder: Connection error to " << server_name << std::endl ;
return ; return ;
} }
#ifdef EXTADDRSEARCH_DEBUG #ifdef EXTADDRSEARCH_DEBUG
std::cerr << "ExtAddrFinder: Connexion established to " << server_name << std::endl ; std::cerr << "ExtAddrFinder: Connection established to " << server_name << std::endl ;
#endif #endif
// envoi // envoi

4
retroshare-gui/src/gui/CreateMsgLinkDialog.cpp
View File

@ -123,8 +123,8 @@ void CreateMsgLinkDialog::createLink()
RSLinkClipboard::copyLinks(links) ; RSLinkClipboard::copyLinks(links) ;
if(!res) if(!res)
QMessageBox::critical(NULL,tr("Messenging invite creation failed"),tr("The creation of the messenging invite failed")) ; QMessageBox::critical(NULL,tr("Messaging invite creation failed"),tr("The creation of the messaging invite failed")) ;
else else
QMessageBox::information(NULL,tr("Messenging invite created"),tr("Your new messenging chat invite has been copied to clipboard. You can now paste it as a Retroshare link.")) ; QMessageBox::information(NULL,tr("Messaging invite created"),tr("Your new messaging chat invite has been copied to clipboard. You can now paste it as a Retroshare link.")) ;
#endif #endif
} }

6
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -1199,7 +1199,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
if(link._time_stamp < time(NULL)) if(link._time_stamp < time(NULL))
{ {
QMessageBox::information(NULL,QObject::tr("Messenging link is expired"),QObject::tr("This Messenging link is expired. The destination peer will not receive it.")) ; QMessageBox::information(NULL,QObject::tr("Messaging link is expired"),QObject::tr("This Messaging link is expired. The destination peer will not receive it.")) ;
break ; break ;
} }
@ -1220,7 +1220,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
} }
if(link._GPGid.toStdString() != rsPeers->getGPGOwnId()) if(link._GPGid.toStdString() != rsPeers->getGPGOwnId())
{ {
QMessageBox::information(NULL,QObject::tr("Chat link cannot be decrypted"),QObject::tr("This chat link is encrypted with a key that is not yours. You can't used it. Key ID = ")+link._GPGid) ; QMessageBox::information(NULL,QObject::tr("Chat link cannot be decrypted"),QObject::tr("This chat link is encrypted with a key that is not yours. You can't use it. Key ID = ")+link._GPGid) ;
break ; break ;
} }
@ -1237,7 +1237,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
case RS_DISTANT_CHAT_ERROR_SIGNATURE_MISMATCH: error_msg = QObject::tr("The link signature cannot be checked.") ; break ; case RS_DISTANT_CHAT_ERROR_SIGNATURE_MISMATCH: error_msg = QObject::tr("The link signature cannot be checked.") ; break ;
case RS_DISTANT_CHAT_ERROR_UNKNOWN_KEY: error_msg = QObject::tr("The link is signed by an unknown key.") ; break ; case RS_DISTANT_CHAT_ERROR_UNKNOWN_KEY: error_msg = QObject::tr("The link is signed by an unknown key.") ; break ;
} }
QMessageBox::information(NULL,QObject::tr("Chat connexion is not possible"),error_msg) ; QMessageBox::information(NULL,QObject::tr("Chat connection is not possible"),error_msg) ;
} }
else else
ChatDialog::chatFriend(hash); ChatDialog::chatFriend(hash);