github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Rewritten bittorrent::packcompact() using net::getBinAddr().

pull/2/head
Tatsuhiro Tsujikawa 2011-10-19 23:24:28 +09:00
parent 3837be82c8
commit 138130497f
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bittorrent_helper.cc
View File

@ -801,30 +801,13 @@ void createPeerMessageString
int packcompact int packcompact
(unsigned char* compact, const std::string& addr, uint16_t port) (unsigned char* compact, const std::string& addr, uint16_t port)
{ {
struct addrinfo* res; size_t len = net::getBinAddr(compact, addr);
int s = if(len == 0) {
callGetaddrinfo(&res, addr.c_str(), 0, AF_UNSPEC, 0, AI_NUMERICHOST, 0);
if(s != 0) {
return 0; return 0;
} }
WSAAPI_AUTO_DELETE<struct addrinfo*> resDeleter(res, freeaddrinfo);
uint16_t portN = htons(port); uint16_t portN = htons(port);
for(struct addrinfo* rp = res; rp; rp = rp->ai_next) { memcpy(compact+len, &portN, sizeof(portN));
if(rp->ai_family == AF_INET) { return len+2;
struct sockaddr_in* in =
reinterpret_cast<struct sockaddr_in*>(rp->ai_addr);
memcpy(compact, &(in->sin_addr), 4);
memcpy(compact+4, &portN, sizeof(portN));
return COMPACT_LEN_IPV4;
} else if(rp->ai_family == AF_INET6) {
struct sockaddr_in6* in6 =
reinterpret_cast<struct sockaddr_in6*>(rp->ai_addr);
memcpy(compact, &(in6->sin6_addr), 16);
memcpy(compact+16, &portN, sizeof(portN));
return COMPACT_LEN_IPV6;
}
}
return 0;
} }
std::pair<std::string, uint16_t> unpackcompact std::pair<std::string, uint16_t> unpackcompact