Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-09 11:18:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix IPv6 support and warn when binding fails"

Browse Source 
Yikes this fix doesn't compile.
This commit is contained in:
Jonathan White 2016-05-24 02:12:33 -04:00
parent 51bfbc964e
commit bb2e1ee8da
1 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/http/Server.cpp
View File

@ -323,18 +323,16 @@ void Server::request_completed(void *, struct MHD_Connection *,
void Server::start(void) void Server::start(void)
{ {
bool nohost = true; if (m_started) return;
struct sockaddr_in6 as;
struct sockaddr_in6 *ss = &as;
if (m_started)
return;
int port = HttpSettings::httpPort(); int port = HttpSettings::httpPort();
struct sockaddr_in as;
struct sockaddr_in *ss = &as;
bool nohost = true;
QHostInfo info = QHostInfo::fromName(HttpSettings::httpHost()); QHostInfo info = QHostInfo::fromName(HttpSettings::httpHost());
if (!info.addresses().isEmpty()) { if (!info.addresses().isEmpty()) {
unsigned int flags = MHD_USE_SELECT_INTERNALLY;
QHostAddress address = info.addresses().first(); QHostAddress address = info.addresses().first();
if (address.protocol() == QAbstractSocket::IPv4Protocol) { if (address.protocol() == QAbstractSocket::IPv4Protocol) {
@ -344,45 +342,32 @@ void Server::start(void)
addr->sin_port = htons(HttpSettings::httpPort()); addr->sin_port = htons(HttpSettings::httpPort());
addr->sin_addr.s_addr = htonl(address.toIPv4Address()); addr->sin_addr.s_addr = htonl(address.toIPv4Address());
nohost = false; nohost = false;
} else if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_IPv6)) { #ifdef MHD_USE_IPv6
struct sockaddr_in6* addr = (struct sockaddr_in6*)ss; } else {
memset(addr, 0, sizeof(struct sockaddr_in6)); struct sockaddr_in6* addr = (sockaddr_in6*)ss;
addr->sin6_family = AF_INET6; memset(addr, 0, sizeof(struct sockaddr_in6));
addr->sin6_port = htons(HttpSettings::httpPort()); addr->sin6_family = AF_INET6;
memcpy(&addr->sin6_addr, address.toIPv6Address().c, 16); addr->sin6_port = htons(HttpSettings::httpPort());
nohost = false; memcpy(&addr->sin6_addr, address.toIPv6Address().c, 16);
flags |= MHD_USE_IPv6; nohost = false;
#endif
} }
if (nohost) { daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, port, NULL, NULL,
qWarning("HTTPPlugin: Faled to get configured host!"); &this->request_handler_wrapper, this,
} else { MHD_OPTION_NOTIFY_COMPLETED,
if (NULL == (daemon = MHD_start_daemon(flags, port, NULL, NULL, this->request_completed, NULL,
&this->request_handler_wrapper, this, MHD_OPTION_SOCK_ADDR,
MHD_OPTION_NOTIFY_COMPLETED, ss,
this->request_completed, NULL, MHD_OPTION_END);
MHD_OPTION_SOCK_ADDR,
ss,
MHD_OPTION_END))) {
nohost = true;
qWarning("HTTPPlugin: Failed to bind to configured host!");
} else {
nohost = false;
//qWarning("HTTPPlugin: Binded to configured host.");
}
}
} }
if (nohost) { if (nohost) {
if (NULL == (daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, port, NULL, NULL, daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, port, NULL, NULL,
&this->request_handler_wrapper, this, &this->request_handler_wrapper, this,
MHD_OPTION_NOTIFY_COMPLETED, MHD_OPTION_NOTIFY_COMPLETED,
this->request_completed, NULL, this->request_completed, NULL,
MHD_OPTION_END))) { MHD_OPTION_END);
qWarning("HTTPPlugin: Fatal! Failed to bind to both configured and default hosts!");
} else {
qWarning("HTTPPlugin: Bound to fallback address 0.0.0.0/:::!");
}
} }
m_started = true; m_started = true;