Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-25 09:11:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

review fixup

Browse Source
This commit is contained in:
sehraf 2020-02-09 12:04:13 +01:00
parent 6e3740f3b8
commit f27022fe7b
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
3 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libretroshare/src/tcponudp/udpstunner.cc
View File

@ -47,12 +47,6 @@ const uint32_t TOU_STUN_MAX_RECV_RATE = 25; /* every 25 seconds */
const int32_t TOU_STUN_DEFAULT_TARGET_RATE = 15; /* 20 secs is minimum to keep a NAT UDP port open */ const int32_t TOU_STUN_DEFAULT_TARGET_RATE = 15; /* 20 secs is minimum to keep a NAT UDP port open */
const double TOU_SUCCESS_LPF_FACTOR = 0.90; const double TOU_SUCCESS_LPF_FACTOR = 0.90;
/*
* based on RFC 3489
*/
const uint16_t STUN_BINDING_REQUEST = 0x0001;
const uint16_t STUN_BINDING_RESPONSE = 0x0101;
#define EXCLUSIVE_MODE_TIMEOUT 300 #define EXCLUSIVE_MODE_TIMEOUT 300
UdpStunner::UdpStunner(UdpPublisher *pub) UdpStunner::UdpStunner(UdpPublisher *pub)
@ -222,7 +216,7 @@ int UdpStunner::releaseExclusiveMode(std::string holder, bool forceStun)
} }
#ifdef DEBUG_UDP_STUNNER_FILTER #ifdef DEBUG_UDP_STUNNER_FILTER
rstime_t now = time(NULL); rstime_t now = time(nullptr);
std::cerr << "UdpStunner::cancelExclusiveMode() Canceled. Was in ExclusiveMode for: " << now - mExclusiveModeTS; std::cerr << "UdpStunner::cancelExclusiveMode() Canceled. Was in ExclusiveMode for: " << now - mExclusiveModeTS;
std::cerr << " secs"; std::cerr << " secs";
std::cerr << std::endl; std::cerr << std::endl;
@ -491,7 +485,7 @@ bool UdpStun_response(void *stun_pkt, int size, struct sockaddr_in &addr)
return false; return false;
} }
if (htons(((uint16_t *) stun_pkt)[0]) != STUN_BINDING_RESPONSE) if (htons(((uint16_t *) stun_pkt)[0]) != UdpStunner::STUN_BINDING_RESPONSE)
{ {
/* not a response */ /* not a response */
return false; return false;
@ -523,40 +517,37 @@ bool UdpStun_generate_stun_pkt(void *stun_pkt, int *len)
} }
/* just the header */ /* just the header */
((uint16_t *) stun_pkt)[0] = (uint16_t) htons(STUN_BINDING_REQUEST); ((uint16_t *) stun_pkt)[0] = (uint16_t) htons(UdpStunner::STUN_BINDING_REQUEST);
((uint16_t *) stun_pkt)[1] = (uint16_t) htons(20); /* only header */ ((uint16_t *) stun_pkt)[1] = (uint16_t) htons(20); /* only header */
/* RFC 3489 /* RFC 3489
* The transaction ID is used to correlate requests and responses. * The transaction ID is used to correlate requests and responses.
* *
* RFC 5389 introduces a mmgic cokie at the location where preciously the transaction ID was located: * RFC 5389 introduces a mmgic cokie at the location where preciously the transaction ID was located:
* In RFC 3489 [RFC3489], this field was part of * In RFC 3489, this field was part of
* the transaction ID; placing the magic cookie in this location allows * the transaction ID; placing the magic cookie in this location allows
* a server to detect if the client will understand certain attributes * a server to detect if the client will understand certain attributes
* that were added in this revised specification. * that were added in this revised specification.
*/ */
((uint32_t *) stun_pkt)[1] = htonl(RsRandom::random_u32()); RsRandom::random_bytes(&((uint8_t *) stun_pkt)[4], 4 * sizeof (uint32_t));
((uint32_t *) stun_pkt)[2] = htonl(RsRandom::random_u32());
((uint32_t *) stun_pkt)[3] = htonl(RsRandom::random_u32());
((uint32_t *) stun_pkt)[4] = htonl(RsRandom::random_u32());
*len = 20; *len = 20;
return true; return true;
} }
void *UdpStun_generate_stun_reply(struct sockaddr_in *stun_addr, int *len, const void *data) void *UdpStun_generate_stun_reply(struct sockaddr_in *stun_addr, int *len, const void *transId)
{ {
/* just the header */ /* just the header */
void *stun_pkt = rs_malloc(28); void *stun_pkt = rs_malloc(28);
if(!stun_pkt) if(!stun_pkt)
return NULL ; return nullptr ;
((uint16_t *) stun_pkt)[0] = (uint16_t) htons(STUN_BINDING_RESPONSE); ((uint16_t *) stun_pkt)[0] = (uint16_t) htons(UdpStunner::STUN_BINDING_RESPONSE);
((uint16_t *) stun_pkt)[1] = (uint16_t) htons(28); /* only header + 8 byte addr */ ((uint16_t *) stun_pkt)[1] = (uint16_t) htons(28); /* only header + 8 byte addr */
/* RFC 3489 /* RFC 3489
* The Binding Response MUST contain the same transaction ID contained in the Binding Request. * The Binding Response MUST contain the same transaction ID contained in the Binding Request.
*/ */
memcpy(&((uint32_t *) stun_pkt)[1], &((uint32_t *) data)[1], 4 * sizeof (uint32_t)); memcpy(&((uint32_t *) stun_pkt)[1], &((uint32_t *) transId)[1], 4 * sizeof (uint32_t));
/* now add address /* now add address
* 0 1 2 3 * 0 1 2 3
@ -600,7 +591,7 @@ bool UdpStun_isStunPacket(void *data, int size)
return false; return false;
} }
if ((size == 20) && (STUN_BINDING_REQUEST == ntohs(((uint16_t *) data)[0]))) if ((size == 20) && (UdpStunner::STUN_BINDING_REQUEST == ntohs(((uint16_t *) data)[0])))
{ {
#ifdef DEBUG_UDP_STUNNER_FILTER #ifdef DEBUG_UDP_STUNNER_FILTER
std::cerr << "UdpStunner::isStunPacket() (size=20 & data[0]=STUN_BINDING_REQUEST) -> true"; std::cerr << "UdpStunner::isStunPacket() (size=20 & data[0]=STUN_BINDING_REQUEST) -> true";
@ -610,7 +601,7 @@ bool UdpStun_isStunPacket(void *data, int size)
return true; return true;
} }
if ((size == 28) && (STUN_BINDING_RESPONSE == ntohs(((uint16_t *) data)[0]))) if ((size == 28) && (UdpStunner::STUN_BINDING_RESPONSE == ntohs(((uint16_t *) data)[0])))
{ {
#ifdef DEBUG_UDP_STUNNER_FILTER #ifdef DEBUG_UDP_STUNNER_FILTER
std::cerr << "UdpStunner::isStunPacket() (size=28 & data[0]=STUN_BINDING_RESPONSE) -> true"; std::cerr << "UdpStunner::isStunPacket() (size=28 & data[0]=STUN_BINDING_RESPONSE) -> true";

21
libretroshare/src/tcponudp/udpstunner.h
View File

@ -55,8 +55,10 @@ class TouStunPeer
/// id for identification /// id for identification
std::string id; std::string id;
/// remote address /// Remote address of the peer.
struct sockaddr_in remote, eaddr; struct sockaddr_in remote;
/// Our external IP address as reported by the peer.
struct sockaddr_in eaddr;
/// true when a response was received in the past /// true when a response was received in the past
bool response; bool response;
/// used to rate limit STUN requests /// used to rate limit STUN requests
@ -114,6 +116,12 @@ virtual int status(std::ostream &out);
/* monitoring / updates */ /* monitoring / updates */
int tick(); int tick();
/*
* based on RFC 3489
*/
static constexpr uint16_t STUN_BINDING_REQUEST = 0x0001;
static constexpr uint16_t STUN_BINDING_RESPONSE = 0x0101;
private: private:
bool checkStunDesired(); bool checkStunDesired();
@ -176,7 +184,14 @@ bool locked_checkExternalAddress();
bool UdpStun_isStunPacket(void *data, int size); bool UdpStun_isStunPacket(void *data, int size);
bool UdpStun_response(void *stun_pkt, int size, struct sockaddr_in &addr); bool UdpStun_response(void *stun_pkt, int size, struct sockaddr_in &addr);
void *UdpStun_generate_stun_reply(struct sockaddr_in *stun_addr, int *len, const void* data); /**
* @brief UdpStun_generate_stun_reply Generates a STUN reply package.
* @param stun_addr The address to set in the response field.
* @param len Lenght of the generated package (always 28).
* @param transId The transaction ID of the request package.
* @return Pointer to the generated reply package.
*/
void *UdpStun_generate_stun_reply(struct sockaddr_in *stun_addr, int *len, const void* transId);
bool UdpStun_generate_stun_pkt(void *stun_pkt, int *len); bool UdpStun_generate_stun_pkt(void *stun_pkt, int *len);
#endif #endif

4
retroshare.pri
View File

@ -117,10 +117,10 @@ no_bitdht:CONFIG -= bitdht
CONFIG *= use_dht_stunner CONFIG *= use_dht_stunner
no_use_dht_stunner:CONFIG -= use_dht_stunner no_use_dht_stunner:CONFIG -= use_dht_stunner
# The DHT stunner can be used to figure out our external IP. As this purely relying on random DHT peers that answer our request, it can easily be abused # The DHT stunner can be used to figure out our external IP. As this purely relying on random DHT peers that answer our request, it can easily be abused.
# Therefore, it is turned off by default. # Therefore, it is turned off by default.
# To enable external ip determination (additionally) based on the dht stunner append the following assignation to qmake # To enable external ip determination (additionally) based on the dht stunner append the following assignation to qmake
# command line "CONFIG+=rs_async_chat" # command line "CONFIG+=use_dht_stunner_ext_ip"
CONFIG *= no_use_dht_stunner_ext_ip CONFIG *= no_use_dht_stunner_ext_ip
use_dht_stunner_ext_ip:CONFIG -= no_use_dht_stunner_ext_ip use_dht_stunner_ext_ip:CONFIG -= no_use_dht_stunner_ext_ip