Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-01 02:36:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed proxy init

Browse source
This commit is contained in:
csoler 2022-01-09 17:06:10 +01:00
parent 2456dbb2a0
commit e7eb606a4a
2 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libretroshare/src/pqi/pqiproxy.cc
View file

@ -20,6 +20,8 @@ int pqiproxyconnection::proxy_negotiate_connection(int sockfd)
case PROXY_STATE_WAITING_SOCKS_RESPONSE: case PROXY_STATE_WAITING_SOCKS_RESPONSE:
ret = Proxy_Connection_Complete(sockfd); // wait for ACK. ret = Proxy_Connection_Complete(sockfd); // wait for ACK.
if(ret < 1)
break; break;
case PROXY_STATE_CONNECTION_COMPLETE: case PROXY_STATE_CONNECTION_COMPLETE:
@ -41,6 +43,8 @@ int pqiproxyconnection::proxy_negotiate_connection(int sockfd)
return -1; return -1;
} }
if(ret < 0)
return -1;
#ifdef PROXY_DEBUG #ifdef PROXY_DEBUG
std::cerr << "pqisslproxy::Basic_Connection_Complete() IN PROGRESS"; std::cerr << "pqisslproxy::Basic_Connection_Complete() IN PROGRESS";
@ -225,8 +229,8 @@ int pqiproxyconnection::Proxy_Send_Address(int sockfd)
return ret; // Method Response not complete. return ret; // Method Response not complete.
} }
char socks_request[MAX_SOCKS_REQUEST_LEN] = char socks_request[MAX_SOCKS_REQUEST_LEN] = {
{ 0x05, // SOCKS VERSION. 0x05, // SOCKS VERSION.
0x01, // CONNECT (Tor doesn't support BIND or UDP). 0x01, // CONNECT (Tor doesn't support BIND or UDP).
0x00, // RESERVED. 0x00, // RESERVED.
0x03, // ADDRESS TYPE (Domain Name) 0x03, // ADDRESS TYPE (Domain Name)
@ -237,9 +241,7 @@ int pqiproxyconnection::Proxy_Send_Address(int sockfd)
uint8_t len = mDomainAddress.length(); uint8_t len = mDomainAddress.length();
socks_request[4] = len; socks_request[4] = len;
for(int i = 0; i < len; i++) for(int i = 0; i < len; i++)
{
socks_request[5 + i] = mDomainAddress[i]; socks_request[5 + i] = mDomainAddress[i];
}
/* now add the port, being careful with packing */ /* now add the port, being careful with packing */
uint16_t net_port = htons(mRemotePort); uint16_t net_port = htons(mRemotePort);