mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-06 08:05:18 -04:00
patch from Henry morgan to fix soem typos (e.g misspelled connexion into connection)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
748f7db7a4
commit
4868a90d81
10 changed files with 22 additions and 22 deletions
|
@ -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
|
||||
// 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.
|
||||
//
|
||||
#ifdef FILE_DEBUG
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
#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 << " SSL id: " << ssl_id << std::endl;
|
||||
std::cerr << " SSL cn: " << ssl_cn << std::endl;
|
||||
|
|
|
@ -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
|
||||
// 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().
|
||||
|
||||
#ifdef PQISSL_DEBUG
|
||||
|
|
|
@ -381,13 +381,13 @@ int pqissllistenbase::continueSSL(IncomingSSLInfo& incoming_connexion_info, bool
|
|||
// attempt the accept again.
|
||||
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()) ;
|
||||
|
||||
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) ;
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
#define RS_MSGTAGTYPE_LATER 5
|
||||
#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_PRIVATE 2 /* lobby invisible by friends. Peers on invitation only .*/
|
||||
|
||||
|
|
|
@ -50,9 +50,9 @@
|
|||
* #define DEBUG_DISTANT_CHAT 1
|
||||
****/
|
||||
|
||||
static const int CONNECTION_CHALLENGE_MAX_COUNT = 20 ; // sends a connexion 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 int CONNECTION_CHALLENGE_MIN_DELAY = 15 ; // sends a connexion at most every 15 seconds
|
||||
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 connection challenge
|
||||
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 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.
|
||||
|
@ -2129,7 +2129,7 @@ void p3ChatService::handleConnectionChallenge(RsChatLobbyConnectChallengeItem *i
|
|||
// Look into message cache of all lobbys to handle the challenge.
|
||||
//
|
||||
#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 << " Peer Id = " << item->PeerId() << std::endl;
|
||||
#endif
|
||||
|
@ -2263,7 +2263,7 @@ void p3ChatService::invitePeerToLobby(const ChatLobbyId& lobby_id, const std::st
|
|||
{
|
||||
#ifdef CHAT_DEBUG
|
||||
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
|
||||
std::cerr << "Sending invitation to peer " << peer_id << " to lobby "<< std::hex << lobby_id << std::dec << std::endl;
|
||||
#endif
|
||||
|
@ -2810,7 +2810,7 @@ void p3ChatService::cleanLobbyCaches()
|
|||
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)
|
||||
{
|
||||
|
@ -2847,7 +2847,7 @@ void p3ChatService::cleanLobbyCaches()
|
|||
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,"------------","") ;
|
||||
|
||||
// send connexion challenges
|
||||
// send connection challenges
|
||||
//
|
||||
for(std::list<ChatLobbyId>::const_iterator it(send_challenge_lobbies.begin());it!=send_challenge_lobbies.end();++it)
|
||||
sendConnectionChallenge(*it) ;
|
||||
|
|
|
@ -61,7 +61,7 @@
|
|||
// 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.
|
||||
//
|
||||
//================================ 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
|
||||
// retreiving data:
|
||||
|
|
|
@ -83,16 +83,16 @@ static void getPage(const std::string& server_name,std::string& page)
|
|||
serveur.sin_port = htons(80);
|
||||
|
||||
#ifdef EXTADDRSEARCH_DEBUG
|
||||
printf("Connexion attempt\n");
|
||||
printf("Connection attempt\n");
|
||||
#endif
|
||||
|
||||
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 ;
|
||||
}
|
||||
#ifdef EXTADDRSEARCH_DEBUG
|
||||
std::cerr << "ExtAddrFinder: Connexion established to " << server_name << std::endl ;
|
||||
std::cerr << "ExtAddrFinder: Connection established to " << server_name << std::endl ;
|
||||
#endif
|
||||
|
||||
// envoi
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue