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

2010-06-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Renamed member variable
	* src/AsyncNameResolver.cc
	* src/AsyncNameResolver.h
pull/1/head
Tatsuhiro Tsujikawa 2010-06-11 13:35:28 +00:00
parent cd48873d41
commit 8046476dfc
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-06-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Renamed member variable
* src/AsyncNameResolver.cc
* src/AsyncNameResolver.h
2010-06-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-06-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Renamed member variable Renamed member variable

30
src/AsyncNameResolver.cc
View File

@ -48,8 +48,8 @@ void callback(void* arg, int status, int timeouts, struct hostent* host)
{ {
AsyncNameResolver* resolverPtr = reinterpret_cast<AsyncNameResolver*>(arg); AsyncNameResolver* resolverPtr = reinterpret_cast<AsyncNameResolver*>(arg);
if(status != ARES_SUCCESS) { if(status != ARES_SUCCESS) {
resolverPtr->error = ares_strerror(status); resolverPtr->_error = ares_strerror(status);
resolverPtr->status = AsyncNameResolver::STATUS_ERROR; resolverPtr->_status = AsyncNameResolver::STATUS_ERROR;
return; return;
} }
for(char** ap = host->h_addr_list; *ap; ++ap) { for(char** ap = host->h_addr_list; *ap; ++ap) {
@ -57,49 +57,49 @@ void callback(void* arg, int status, int timeouts, struct hostent* host)
memcpy(&addr, *ap, sizeof(in_addr)); memcpy(&addr, *ap, sizeof(in_addr));
resolverPtr->_resolvedAddresses.push_back(inet_ntoa(addr)); resolverPtr->_resolvedAddresses.push_back(inet_ntoa(addr));
} }
resolverPtr->status = AsyncNameResolver::STATUS_SUCCESS; resolverPtr->_status = AsyncNameResolver::STATUS_SUCCESS;
} }
AsyncNameResolver::AsyncNameResolver(): AsyncNameResolver::AsyncNameResolver():
status(STATUS_READY) _status(STATUS_READY)
{ {
// TODO evaluate return value // TODO evaluate return value
ares_init(&channel); ares_init(&_channel);
} }
AsyncNameResolver::~AsyncNameResolver() AsyncNameResolver::~AsyncNameResolver()
{ {
ares_destroy(channel); ares_destroy(_channel);
} }
void AsyncNameResolver::resolve(const std::string& name) void AsyncNameResolver::resolve(const std::string& name)
{ {
_hostname = name; _hostname = name;
status = STATUS_QUERYING; _status = STATUS_QUERYING;
ares_gethostbyname(channel, name.c_str(), AF_INET, callback, this); ares_gethostbyname(_channel, name.c_str(), AF_INET, callback, this);
} }
int AsyncNameResolver::getFds(fd_set* rfdsPtr, fd_set* wfdsPtr) const int AsyncNameResolver::getFds(fd_set* rfdsPtr, fd_set* wfdsPtr) const
{ {
return ares_fds(channel, rfdsPtr, wfdsPtr); return ares_fds(_channel, rfdsPtr, wfdsPtr);
} }
void AsyncNameResolver::process(fd_set* rfdsPtr, fd_set* wfdsPtr) void AsyncNameResolver::process(fd_set* rfdsPtr, fd_set* wfdsPtr)
{ {
ares_process(channel, rfdsPtr, wfdsPtr); ares_process(_channel, rfdsPtr, wfdsPtr);
} }
#ifdef HAVE_LIBCARES #ifdef HAVE_LIBCARES
int AsyncNameResolver::getsock(sock_t* sockets) const int AsyncNameResolver::getsock(sock_t* sockets) const
{ {
return ares_getsock(channel, reinterpret_cast<ares_socket_t*>(sockets), return ares_getsock(_channel, reinterpret_cast<ares_socket_t*>(sockets),
ARES_GETSOCK_MAXNUM); ARES_GETSOCK_MAXNUM);
} }
void AsyncNameResolver::process(ares_socket_t readfd, ares_socket_t writefd) void AsyncNameResolver::process(ares_socket_t readfd, ares_socket_t writefd)
{ {
ares_process_fd(channel, readfd, writefd); ares_process_fd(_channel, readfd, writefd);
} }
#endif // HAVE_LIBCARES #endif // HAVE_LIBCARES
@ -113,10 +113,10 @@ void AsyncNameResolver::reset()
{ {
_hostname = A2STR::NIL; _hostname = A2STR::NIL;
_resolvedAddresses.clear(); _resolvedAddresses.clear();
status = STATUS_READY; _status = STATUS_READY;
ares_destroy(channel); ares_destroy(_channel);
// TODO evaluate return value // TODO evaluate return value
ares_init(&channel); ares_init(&_channel);
} }
} // namespace aria2 } // namespace aria2

10
src/AsyncNameResolver.h
View File

@ -62,11 +62,11 @@ public:
STATUS_ERROR, STATUS_ERROR,
}; };
private: private:
STATUS status; STATUS _status;
ares_channel channel; ares_channel _channel;
std::vector<std::string> _resolvedAddresses; std::vector<std::string> _resolvedAddresses;
std::string error; std::string _error;
std::string _hostname; std::string _hostname;
public: public:
AsyncNameResolver(); AsyncNameResolver();
@ -82,12 +82,12 @@ public:
const std::string& getError() const const std::string& getError() const
{ {
return error; return _error;
} }
STATUS getStatus() const STATUS getStatus() const
{ {
return status; return _status;
} }
int getFds(fd_set* rfdsPtr, fd_set* wfdsPtr) const; int getFds(fd_set* rfdsPtr, fd_set* wfdsPtr) const;