hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed all-interface IPv6 sockets being created when attempting to listen on a non-IPv6 interface address

Browse source
This commit is contained in:
Thulinma 2018-10-07 16:59:55 +02:00
parent 14fa673df6
commit 1b137ad3c3
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/socket.cpp
View file

@ -1095,10 +1095,16 @@ bool Socket::Server::IPv6bind(int port, std::string hostname, bool nonblock){
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.sin6_family = AF_INET6; addr.sin6_family = AF_INET6;
addr.sin6_port = htons(port); // set port addr.sin6_port = htons(port); // set port
//set interface, 0.0.0.0 (default) is all
if (hostname == "0.0.0.0" || hostname.length() == 0){ if (hostname == "0.0.0.0" || hostname.length() == 0){
addr.sin6_addr = in6addr_any; addr.sin6_addr = in6addr_any;
}else{ }else{
inet_pton(AF_INET6, hostname.c_str(), &addr.sin6_addr); // set interface, 0.0.0.0 (default) is all if (inet_pton(AF_INET6, hostname.c_str(), &addr.sin6_addr) != 1){
errors = strerror(errno);
HIGH_MSG("Could not convert '%s' to a valid IPv6 address", hostname.c_str());
close();
return false;
}
} }
int ret = bind(sock, (sockaddr *)&addr, sizeof(addr)); // do the actual bind int ret = bind(sock, (sockaddr *)&addr, sizeof(addr)); // do the actual bind
if (ret == 0){ if (ret == 0){
@ -1143,10 +1149,16 @@ bool Socket::Server::IPv4bind(int port, std::string hostname, bool nonblock){
memset(&addr4, 0, sizeof(addr4)); memset(&addr4, 0, sizeof(addr4));
addr4.sin_family = AF_INET; addr4.sin_family = AF_INET;
addr4.sin_port = htons(port); // set port addr4.sin_port = htons(port); // set port
//set interface, 0.0.0.0 (default) is all
if (hostname == "0.0.0.0" || hostname.length() == 0){ if (hostname == "0.0.0.0" || hostname.length() == 0){
addr4.sin_addr.s_addr = INADDR_ANY; addr4.sin_addr.s_addr = INADDR_ANY;
}else{ }else{
inet_pton(AF_INET, hostname.c_str(), &addr4.sin_addr); // set interface, 0.0.0.0 (default) is all if (inet_pton(AF_INET, hostname.c_str(), &addr4.sin_addr) != 1){
errors = strerror(errno);
HIGH_MSG("Could not convert '%s' to a valid IPv4 address", hostname.c_str());
close();
return false;
}
} }
int ret = bind(sock, (sockaddr *)&addr4, sizeof(addr4)); // do the actual bind int ret = bind(sock, (sockaddr *)&addr4, sizeof(addr4)); // do the actual bind
if (ret == 0){ if (ret == 0){