valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 10:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

THRIFT-2156: fix errno handling in server socket

Browse Source 
Client: C++
Patch: Jens Geyer

This closes #1055
This commit is contained in:
Jens Geyer 2016-07-24 12:11:25 +02:00
parent e5176241c3
commit bcad91771b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cpp/src/thrift/transport/TServerSocket.cpp
View File

@ -276,15 +276,16 @@ void TServerSocket::listen() {
throw TTransportException(TTransportException::BAD_ARGS, "Specified port is invalid"); throw TTransportException(TTransportException::BAD_ARGS, "Specified port is invalid");
} }
struct addrinfo hints;
const struct addrinfo *res; const struct addrinfo *res;
int error; int error;
char port[sizeof("65535")]; char port[sizeof("65535")];
snprintf(port, sizeof(port), "%d", port_);
struct addrinfo hints;
std::memset(&hints, 0, sizeof(hints)); std::memset(&hints, 0, sizeof(hints));
hints.ai_family = PF_UNSPEC; hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
snprintf(port, sizeof("65535"), "%d", port_);
// If address is not specified use wildcard address (NULL) // If address is not specified use wildcard address (NULL)
TGetAddrInfoWrapper info(address_.empty() ? NULL : &address_[0], port, &hints); TGetAddrInfoWrapper info(address_.empty() ? NULL : &address_[0], port, &hints);
@ -523,9 +524,9 @@ void TServerSocket::listen() {
if (retries > retryLimit_) { if (retries > retryLimit_) {
char errbuf[1024]; char errbuf[1024];
if (!path_.empty()) { if (!path_.empty()) {
snprintf(errbuf, 1024, "TServerSocket::listen() PATH %s", path_.c_str()); snprintf(errbuf, sizeof(errbuf), "TServerSocket::listen() PATH %s", path_.c_str());
} else { } else {
snprintf(errbuf, 1024, "TServerSocket::listen() BIND %d", port_); snprintf(errbuf, sizeof(errbuf), "TServerSocket::listen() BIND %d", port_);
} }
GlobalOutput(errbuf); GlobalOutput(errbuf);
close(); close();