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

Addition of several utility functions:

Browse source 
(1) xpgp_id to extract the name/id from a certificate.
(2) dht_bootstrap to check the status of the bootstrap peers.

Various bits of code needed to be rearranged to make these utilities possible.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@394 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-03-21 02:02:58 +00:00
parent e1f4dc1dff
commit 7044822e1f
12 changed files with 651 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libretroshare/src/tcponudp/udpsorter.cc
View file

@ -69,7 +69,7 @@ void UdpSorter::recvPkt(void *data, int size, struct sockaddr_in &from)
it = streams.find(from);
/* check for STUN packet */
if (isStunPacket(data, size))
if (UdpStun_isStunPacket(data, size))
{
std::cerr << "UdpSorter::recvPkt() is Stun Packet";
std::cerr << std::endl;
@ -230,7 +230,7 @@ bool UdpSorter::locked_handleStunPkt(void *data, int size, struct sockaddr_in &f
/* generate a response */
int len;
void *pkt = generate_stun_reply(&from, &len);
void *pkt = UdpStun_generate_stun_reply(&from, &len);
if (!pkt)
return false;
@ -252,7 +252,7 @@ bool UdpSorter::locked_handleStunPkt(void *data, int size, struct sockaddr_in &f
#endif
/* got response */
struct sockaddr_in eAddr;
bool good = response(data, size, eAddr);
bool good = UdpStun_response(data, size, eAddr);
if (good)
{
#ifdef DEBUG_UDP_SORTER
@ -310,7 +310,7 @@ int UdpSorter::doStun(struct sockaddr_in stun_addr)
#define MAX_STUN_SIZE 64
char stundata[MAX_STUN_SIZE];
int tmplen = MAX_STUN_SIZE;
bool done = generate_stun_pkt(stundata, &tmplen);
bool done = UdpStun_generate_stun_pkt(stundata, &tmplen);
if (!done)
{
#ifdef DEBUG_UDP_SORTER
@ -343,7 +343,11 @@ int UdpSorter::doStun(struct sockaddr_in stun_addr)
return 1;
}
bool UdpSorter::response(void *stun_pkt, int size, struct sockaddr_in &addr)
/******************************* STUN Handling ********************************/
/***** These next functions are generic and not dependent on class variables **/
/******************************* STUN Handling ********************************/
bool UdpStun_response(void *stun_pkt, int size, struct sockaddr_in &addr)
{
/* check what type it is */
if (size < 28)
@ -376,7 +380,7 @@ bool UdpSorter::response(void *stun_pkt, int size, struct sockaddr_in &addr)
}
bool UdpSorter::generate_stun_pkt(void *stun_pkt, int *len)
bool UdpStun_generate_stun_pkt(void *stun_pkt, int *len)
{
if (*len < 20)
{
@ -396,7 +400,7 @@ bool UdpSorter::generate_stun_pkt(void *stun_pkt, int *len)
}
void *UdpSorter::generate_stun_reply(struct sockaddr_in *stun_addr, int *len)
void *UdpStun_generate_stun_reply(struct sockaddr_in *stun_addr, int *len)
{
/* just the header */
void *stun_pkt = malloc(28);
@ -422,7 +426,7 @@ void *UdpSorter::generate_stun_reply(struct sockaddr_in *stun_addr, int *len)
return stun_pkt;
}
bool UdpSorter::isStunPacket(void *data, int size)
bool UdpStun_isStunPacket(void *data, int size)
{
#ifdef DEBUG_UDP_SORTER
std::cerr << "UdpSorter::isStunPacket() ?";

11
libretroshare/src/tcponudp/udpsorter.h
View file

@ -99,14 +99,10 @@ int status(std::ostream &out);
private:
/* STUN handling */
bool isStunPacket(void *data, int size);
bool locked_handleStunPkt(void *data, int size, struct sockaddr_in &from);
int doStun(struct sockaddr_in stun_addr);
bool response(void *stun_pkt, int size, struct sockaddr_in &addr);
void *generate_stun_reply(struct sockaddr_in *stun_addr, int *len);
bool generate_stun_pkt(void *stun_pkt, int *len);
/* stun keepAlive */
bool locked_printStunList();
@ -137,4 +133,11 @@ bool storeStunPeer(const struct sockaddr_in &remote, const char *peerid);
};
/* generic stun functions */
bool UdpStun_isStunPacket(void *data, int size);
bool UdpStun_response(void *stun_pkt, int size, struct sockaddr_in &addr);
void *UdpStun_generate_stun_reply(struct sockaddr_in *stun_addr, int *len);
bool UdpStun_generate_stun_pkt(void *stun_pkt, int *len);
#endif