Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added thread safe function for inet_ntoa in libbitdht.

Browse Source 
Used the existing thread safe function for inet_ntoa in libretroshare.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5033 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-03-18 01:33:25 +00:00
parent 117d10eb44
commit 0b1126babf
10 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libbitdht/src/bitdht/bdfilter.cc
View File

@ -126,7 +126,7 @@ int bdFilter::addPeerToFilter(const bdId *id, uint32_t flags)
uint32_t saddr = id->addr.sin_addr.s_addr;
mIpsBanned.insert(saddr);
std::cerr << "Adding New Banned Ip Address: " << inet_ntoa(id->addr.sin_addr);
std::cerr << "Adding New Banned Ip Address: " << bdnet_inet_ntoa(id->addr.sin_addr);
std::cerr << std::endl;
return true;

2
libbitdht/src/bitdht/bdmanager.cc
View File

@ -1031,7 +1031,7 @@ int bdNodeManager::getDhtPeerAddress(const bdNodeId *id, struct sockaddr_in &fro
from = pit->second.mDhtAddr;
std::cerr << "bdNodeManager::getDhtPeerAddress() Found Peer Address:";
std::cerr << inet_ntoa(from.sin_addr) << ":" << htons(from.sin_port);
std::cerr << bdnet_inet_ntoa(from.sin_addr) << ":" << htons(from.sin_port);
std::cerr << std::endl;
return 1;

2
libbitdht/src/bitdht/bdnode.cc
View File

@ -2234,7 +2234,7 @@ bdNodeNetMsg::bdNodeNetMsg(char *msg, int len, struct sockaddr_in *in_addr)
void bdNodeNetMsg::print(std::ostream &out)
{
out << "bdNodeNetMsg::print(" << mSize << ") to "
<< inet_ntoa(addr.sin_addr) << ":" << htons(addr.sin_port);
<< bdnet_inet_ntoa(addr.sin_addr) << ":" << htons(addr.sin_port);
out << std::endl;
}

2
libbitdht/src/bitdht/bdstddht.cc
View File

@ -209,7 +209,7 @@ void bdStdPrintNodeId(std::ostream &out, const bdNodeId *a)
void bdStdPrintId(std::ostream &out, const bdId *a)
{
bdStdPrintNodeId(out, &(a->id));
out << " ip:" << inet_ntoa(a->addr.sin_addr);
out << " ip:" << bdnet_inet_ntoa(a->addr.sin_addr);
out << ":" << ntohs(a->addr.sin_port);
return;
}

2
libbitdht/src/bitdht/bdstore.cc
View File

@ -227,7 +227,7 @@ void bdStore::writeStore(std::string file)
std::list<bdPeer>::iterator it;
for(it = store.begin(); it != store.end(); it++)
{
fprintf(fd, "%s %d\n", inet_ntoa(it->mPeerId.addr.sin_addr), ntohs(it->mPeerId.addr.sin_port));
fprintf(fd, "%s %d\n", bdnet_inet_ntoa(it->mPeerId.addr.sin_addr).c_str(), ntohs(it->mPeerId.addr.sin_port));
#ifdef DEBUG_STORE
fprintf(stderr, "Storing Peer Address: %s %d\n", inet_ntoa(it->mPeerId.addr.sin_addr), ntohs(it->mPeerId.addr.sin_port));
#endif

2
libbitdht/src/udp/udplayer.cc
View File

@ -83,7 +83,7 @@ class udpPacket
//std::ostream &operator<<(std::ostream &out, const struct sockaddr_in &addr)
std::ostream &operator<<(std::ostream &out, struct sockaddr_in &addr)
{
out << "[" << inet_ntoa(addr.sin_addr) << ":";
out << "[" << bdnet_inet_ntoa(addr.sin_addr) << ":";
out << htons(addr.sin_port) << "]";
return out;
}

12
libbitdht/src/util/bdnet.cc
View File

@ -27,6 +27,7 @@
#include "bdnet.h"
#include <iostream>
#include <sstream>
#include <stdlib.h>
#include <string.h>
@ -356,4 +357,15 @@ void bdsockaddr_clear(struct sockaddr_in *addr)
memset(addr, 0, sizeof(*addr));
}
/* thread-safe version of inet_ntoa */
std::string bdnet_inet_ntoa(struct in_addr in)
{
std::ostringstream str;
uint8_t *bytes = (uint8_t *) &(in.s_addr);
str << (int) bytes[0] << ".";
str << (int) bytes[1] << ".";
str << (int) bytes[2] << ".";
str << (int) bytes[3];
return str.str();
}

3
libbitdht/src/util/bdnet.h
View File

@ -27,6 +27,7 @@
*/
#include <inttypes.h>
#include <string>
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
#if defined(_WIN32) || defined(__MINGW32__)
@ -104,6 +105,8 @@ int bdnet_inet_aton(const char *name, struct in_addr *addr);
int bdnet_checkTTL(int fd);
void bdsockaddr_clear(struct sockaddr_in *addr);
/* thread-safe version of inet_ntoa */
std::string bdnet_inet_ntoa(struct in_addr in);
/* Extra stuff to declare for windows error handling (mimics unix errno)
*/

4
libretroshare/src/dht/p3bitdht_interface.cc
View File

@ -156,7 +156,7 @@ std::string p3BitDht::getUdpAddressString()
if (mDhtStunner->externalAddr(extAddr, extStable))
{
out << " DhtExtAddr: " << inet_ntoa(extAddr.sin_addr);
out << " DhtExtAddr: " << rs_inet_ntoa(extAddr.sin_addr);
out << ":" << ntohs(extAddr.sin_port);
if (extStable)
@ -174,7 +174,7 @@ std::string p3BitDht::getUdpAddressString()
}
if (mProxyStunner->externalAddr(extAddr, extStable))
{
out << " ProxyExtAddr: " << inet_ntoa(extAddr.sin_addr);
out << " ProxyExtAddr: " << rs_inet_ntoa(extAddr.sin_addr);
out << ":" << ntohs(extAddr.sin_port);
if (extStable)

2
libretroshare/src/util/rsnet.cc
View File

@ -132,7 +132,7 @@ bool isExternalNet(const struct in_addr *addr)
std::ostream &operator<<(std::ostream &out, const struct sockaddr_in &addr)
{
out << "[" << inet_ntoa(addr.sin_addr) << ":";
out << "[" << rs_inet_ntoa(addr.sin_addr) << ":";
out << htons(addr.sin_port) << "]";
return out;
}