walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Cleanup create_evlistener

This commit is contained in:
Tatsuhiro Tsujikawa 2014-07-06 19:21:18 +09:00
parent a02624c9ed
commit 9f1c819242
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/shrpx.cc
View File

@ -139,7 +139,7 @@ evconnlistener* create_evlistener(ListenHandler *handler, int family)
{ {
addrinfo hints; addrinfo hints;
int fd = -1; int fd = -1;
int r; int rv;
auto service = util::utos(get_config()->port); auto service = util::utos(get_config()->port);
memset(&hints, 0, sizeof(addrinfo)); memset(&hints, 0, sizeof(addrinfo));
@ -154,14 +154,14 @@ evconnlistener* create_evlistener(ListenHandler *handler, int family)
nullptr : get_config()->host.get(); nullptr : get_config()->host.get();
addrinfo *res, *rp; addrinfo *res, *rp;
r = getaddrinfo(node, service.c_str(), &hints, &res); rv = getaddrinfo(node, service.c_str(), &hints, &res);
if(r != 0) { if(rv != 0) {
if(LOG_ENABLED(INFO)) { if(LOG_ENABLED(INFO)) {
LOG(INFO) << "Unable to get IPv" << (family == AF_INET ? "4" : "6") LOG(INFO) << "Unable to get IPv" << (family == AF_INET ? "4" : "6")
<< " address for " << get_config()->host.get() << ": " << " address for " << get_config()->host.get() << ": "
<< gai_strerror(r); << gai_strerror(rv);
} }
return NULL; return nullptr;
} }
for(rp = res; rp; rp = rp->ai_next) { for(rp = res; rp; rp = rp->ai_next) {
fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
@ -189,28 +189,31 @@ evconnlistener* create_evlistener(ListenHandler *handler, int family)
} }
close(fd); close(fd);
} }
if(rp) {
char host[NI_MAXHOST]; if(!rp) {
r = getnameinfo(rp->ai_addr, rp->ai_addrlen, host, sizeof(host), LOG(WARNING) << "Listening " << (family == AF_INET ? "IPv4" : "IPv6")
0, 0, NI_NUMERICHOST); << " socket failed";
if(r == 0) {
if(LOG_ENABLED(INFO)) { return nullptr;
LOG(INFO) << "Listening on " << host << ", port "
<< get_config()->port;
}
} else {
LOG(FATAL) << gai_strerror(r);
DIE();
}
} }
char host[NI_MAXHOST];
rv = getnameinfo(rp->ai_addr, rp->ai_addrlen, host, sizeof(host),
nullptr, 0, NI_NUMERICHOST);
if(rv != 0) {
LOG(WARNING) << gai_strerror(rv);
close(fd);
return nullptr;
}
if(LOG_ENABLED(INFO)) {
LOG(INFO) << "Listening on " << host << ", port " << get_config()->port;
}
freeaddrinfo(res); freeaddrinfo(res);
if(rp == 0) {
if(LOG_ENABLED(INFO)) {
LOG(INFO) << "Listening " << (family == AF_INET ? "IPv4" : "IPv6")
<< " socket failed";
}
return 0;
}
auto evlistener = evconnlistener_new auto evlistener = evconnlistener_new
(handler->get_evbase(), (handler->get_evbase(),