kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-24 04:20:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Linux implementation to select interface to bind to

Browse Source
This commit is contained in:
Florian Schüller 2015-12-12 00:23:10 +01:00
parent 09cd024199
commit 912fb35fae
1 changed files with 70 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/server/kiwix-serve.cpp
View File

@ -72,6 +72,10 @@ extern "C" {
#include <stdint.h> #include <stdint.h>
#include <unistd.h> #include <unistd.h>
#include <microhttpd.h> #include <microhttpd.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <netdb.h>
#include <ifaddrs.h>
#endif #endif
using namespace std; using namespace std;
@ -458,6 +462,7 @@ int main(int argc, char **argv) {
string libraryPath; string libraryPath;
string indexPath; string indexPath;
string rootPath; string rootPath;
string interface;
int serverPort = 80; int serverPort = 80;
int daemonFlag = false; int daemonFlag = false;
int libraryFlag = false; int libraryFlag = false;
@ -476,11 +481,12 @@ int main(int argc, char **argv) {
{"index", required_argument, 0, 'i'}, {"index", required_argument, 0, 'i'},
{"attachToProcess", required_argument, 0, 'a'}, {"attachToProcess", required_argument, 0, 'a'},
{"port", required_argument, 0, 'p'}, {"port", required_argument, 0, 'p'},
{"interface", required_argument, 0, 'f'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
int option_index = 0; int option_index = 0;
int c = getopt_long(argc, argv, "ndvli:a:p:", long_options, &option_index); int c = getopt_long(argc, argv, "ndvli:a:p:f:", long_options, &option_index);
if (c != -1) { if (c != -1) {
@ -507,6 +513,9 @@ int main(int argc, char **argv) {
PPIDString = string(optarg); PPIDString = string(optarg);
PPID = atoi(optarg); PPID = atoi(optarg);
break; break;
case 'f':
interface = string(optarg);
break;
} }
} else { } else {
if (optind < argc) { if (optind < argc) {
@ -521,8 +530,8 @@ int main(int argc, char **argv) {
/* Print usage)) if necessary */ /* Print usage)) if necessary */
if (zimPath.empty() && libraryPath.empty()) { if (zimPath.empty() && libraryPath.empty()) {
cerr << "Usage: kiwix-serve [--index=INDEX_PATH] [--port=PORT] [--verbose] [--nosearchbar] [--daemon] [--attachToProcess=PID] ZIM_PATH" << endl; cerr << "Usage: kiwix-serve [--index=INDEX_PATH] [--port=PORT] [--verbose] [--nosearchbar] [--daemon] [--attachToProcess=PID] [--interface=IF_NAME] ZIM_PATH" << endl;
cerr << " kiwix-serve --library [--port=PORT] [--verbose] [--daemon] [--nosearchbar] [--attachToProcess=PID] LIBRARY_PATH" << endl; cerr << " kiwix-serve --library [--port=PORT] [--verbose] [--daemon] [--nosearchbar] [--attachToProcess=PID] [--interface=IF_NAME] LIBRARY_PATH" << endl;
exit(1); exit(1);
} }
@ -683,13 +692,64 @@ int main(int argc, char **argv) {
/* Start the HTTP daemon */ /* Start the HTTP daemon */
void *page = NULL; void *page = NULL;
daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, if (interface.length() > 0) {
serverPort, #ifndef _WIN32
NULL, /* TBD IPv6 support */
NULL, struct sockaddr_in sockAddr;
&accessHandlerCallback,
page, struct ifaddrs *ifaddr, *ifa;
MHD_OPTION_END); int family, n;
char host[NI_MAXHOST];
memset(&sockAddr,0, sizeof(sockAddr));
if (getifaddrs(&ifaddr) == -1) {
cerr << "Getifaddrs() failed while searching for '" << interface << "'" << endl;
exit(1);
}
for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
if (ifa->ifa_addr == NULL)
continue;
family = ifa->ifa_addr->sa_family;
if (family == AF_INET) {
if (strcasecmp(ifa->ifa_name, interface.c_str()) == 0) {
sockAddr.sin_family = family;
sockAddr.sin_port = htons(serverPort);
sockAddr.sin_addr.s_addr = ((struct sockaddr_in*) ifa->ifa_addr)->sin_addr.s_addr;
break;
}
}
}
freeifaddrs(ifaddr);
if (sockAddr.sin_family == 0) {
cerr << "I couldn't find interface '" << interface << "'" << endl;
exit(1);
}
daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY,
serverPort,
NULL,
NULL,
&accessHandlerCallback,
page,
MHD_OPTION_SOCK_ADDR,
&sockAddr,
MHD_OPTION_END);
#else
cerr << "Setting interface - not yet implemented in Windows" << endl;
exit(1);
#endif
} else {
daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY,
serverPort,
NULL,
NULL,
&accessHandlerCallback,
page,
MHD_OPTION_END);
}
if (daemon == NULL) { if (daemon == NULL) {
cerr << "Unable to instanciate the HTTP daemon. The port " << serverPort << " is maybe already occupied or need more permissions to be open. Please try as root or with a port number higher or equal to 1024." << endl; cerr << "Unable to instanciate the HTTP daemon. The port " << serverPort << " is maybe already occupied or need more permissions to be open. Please try as root or with a port number higher or equal to 1024." << endl;