#include "log.h"
#include "timer.h"
#include "version.h"
-
-#define TCP_SOCK 0
-#define TCP_SOCK6 1
-
-#define UDP_SOCK 2
-#define UDP_SOCK6 3
+#include "util.h"
+#include "sharedmemory.h"
/* globals */
bool_t shutdown_server;
extern char *bindaddr6;
extern int bindport;
extern int bindport6;
-
int* udpsocks;
+bool_t hasv4 = true, hasv6 = true;
+
+const int on = 1;
+int nofServerSocks = 4;
+
+/* Check which IP versions are supported by the system. */
+void checkIPversions()
+{
+ int testsocket = -1;
+
+ testsocket = socket(PF_INET, SOCK_STREAM, 0);
+ hasv4 = (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) ? false : true;
+ if (!(testsocket < 0)) close(testsocket);
+
+ testsocket = socket(PF_INET6, SOCK_STREAM, 0);
+ hasv6 = (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) ? false : true;
+ if (!(testsocket < 0)) close(testsocket);
+
+ if(!hasv4)
+ {
+ Log_info("IPv4 is not supported by this system");
+ nofServerSocks -= 2;
+ }
+
+ if(!hasv6)
+ {
+ Log_info("IPv6 is not supported by this system");
+ nofServerSocks -= 2;
+ }
+ if(nofServerSocks == 0)
+ {
+ Log_fatal("Neither IPv4 nor IPv6 are supported by this system");
+ }
+}
/* Initialize the address structures for IPv4 and IPv6 */
struct sockaddr_storage** Server_setupAddressesAndPorts()
{
- struct sockaddr_storage** addresses = malloc(2 * sizeof(void*));
+ struct sockaddr_storage** addresses = calloc(2, sizeof(void*));
+ if(!addresses)
+ Log_fatal("Not enough memory to allocate addresses");
struct sockaddr_storage* v4address = calloc(1, sizeof(struct sockaddr_storage));
+ if(!v4address)
+ Log_fatal("Not enough memory to allocate IPv4 address");
v4address->ss_family = AF_INET;
+
struct sockaddr_storage* v6address = calloc(1, sizeof(struct sockaddr_storage));
+ if(!v6address)
+ Log_fatal("Not enough memory to allocate IPv6 address");
v6address->ss_family = AF_INET6;
-#if defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(__APPLE__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
v4address->ss_len = sizeof(struct sockaddr_storage);
v6address->ss_len = sizeof(struct sockaddr_storage);
#endif
int error = 0;
- const char* confadd = getStrConf(BINDADDR);
error = inet_pton(AF_INET, (!bindaddr) ? ((getStrConf(BINDADDR)) ? getStrConf(BINDADDR) : "0.0.0.0")
: bindaddr, &(((struct sockaddr_in*)v4address)->sin_addr));
- if (error == 0) Log_fatal("Invalid IPv4 address supplied!");
+ if (error == 0)
+ Log_fatal("Invalid IPv4 address supplied!");
+ else if (error == -1)
+ Log_warn("Could not allocate IPv4 address");
error = inet_pton(AF_INET6, (!bindaddr6) ? ((getStrConf(BINDADDR6)) ? getStrConf(BINDADDR6) : "::")
: bindaddr6, &(((struct sockaddr_in6*)v6address)->sin6_addr));
- if (error == 0) Log_fatal("Invalid IPv6 address supplied!");
+ if (error == 0)
+ Log_fatal("Invalid IPv6 address supplied!");
+ else if (error == -1)
+ Log_warn("Could not allocate IPv6 address");
((struct sockaddr_in*)v4address)->sin_port = htons((bindport) ? bindport : getIntConf(BINDPORT));
((struct sockaddr_in6*)v6address)->sin6_port = htons((bindport6) ? bindport6 : getIntConf(BINDPORT6));
void Server_runLoop(struct pollfd* pollfds)
{
- int timeout = 1000, rc, clientcount;
+ int timeout, rc, clientcount;
etimer_t janitorTimer;
Timer_init(&janitorTimer);
struct sockaddr_storage remote;
int i;
- pollfds[UDP_SOCK].revents = 0;
- pollfds[UDP_SOCK6].revents = 0;
- pollfds[TCP_SOCK].revents = 0;
- pollfds[TCP_SOCK6].revents = 0;
- clientcount = Client_getfds(&pollfds[4]);
+#ifdef USE_SHAREDMEMORY_API
+ Sharedmemory_alivetick();
+#endif
+
+ for(i = 0; i < nofServerSocks; i++) {
+ pollfds[i].revents = 0;
+ }
+
+ clientcount = Client_getfds(&pollfds[nofServerSocks]);
timeout = (int)(1000000LL - (int64_t)Timer_elapsed(&janitorTimer)) / 1000LL;
if (timeout <= 0) {
Timer_restart(&janitorTimer);
timeout = (int)(1000000LL - (int64_t)Timer_elapsed(&janitorTimer)) / 1000LL;
}
- rc = poll(pollfds, clientcount + 4, timeout);
- if (rc == 0) { /* Timeout */
- /* Do maintenance */
+ rc = poll(pollfds, clientcount + nofServerSocks, timeout);
+ if (rc == 0) {
+ /* Poll timed out, do maintenance */
Timer_restart(&janitorTimer);
Client_janitor();
continue;
if (errno == EINTR) /* signal */
continue;
else
- Log_fatal("poll: error %d", errno);
- }
- if (pollfds[TCP_SOCK].revents) { /* New tcp connection */
- int tcpfd, flag = 1;
- uint32_t addrlen;
- addrlen = sizeof(struct sockaddr_in);
- tcpfd = accept(pollfds[TCP_SOCK].fd, (struct sockaddr*)&remote, &addrlen);
- fcntl(tcpfd, F_SETFL, O_NONBLOCK);
- setsockopt(tcpfd, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int));
- Log_debug("Connection from %s port %d\n", inet_ntoa(((struct sockaddr_in*)&remote)->sin_addr),
- ntohs(((struct sockaddr_in*)&remote)->sin_port));
- if (Client_add(tcpfd, &remote) < 0)
- close(tcpfd);
+ Log_fatal("poll: error %d (%s)", errno, strerror(errno));
}
- if (pollfds[TCP_SOCK6].revents) { /* New tcp connection */
- int tcpfd, flag = 1;
- uint32_t addrlen;
- addrlen = sizeof(struct sockaddr_in6);
- tcpfd = accept(pollfds[TCP_SOCK6].fd, (struct sockaddr*)&remote, &addrlen);
- fcntl(tcpfd, F_SETFL, O_NONBLOCK);
- setsockopt(tcpfd, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int));
- if (Client_add(tcpfd, &remote) < 0)
- close(tcpfd);
+ /* Check for new connection */
+ for (i = 0; i < nofServerSocks / 2; i++) {
+ if (pollfds[i].revents) {
+ int tcpfd;
+ uint32_t addrlen = sizeof(struct sockaddr_storage);
+ tcpfd = accept(pollfds[i].fd, (struct sockaddr *)&remote, &addrlen);
+ fcntl(tcpfd, F_SETFL, O_NONBLOCK);
+ setsockopt(tcpfd, IPPROTO_TCP, TCP_NODELAY, (char *) &on, sizeof(int));
+ char *addressString = Util_addressToString(&remote);
+ Log_debug("Connection from %s port %d\n", addressString, Util_addressToPort(&remote));
+ free(addressString);
+ if (Client_add(tcpfd, &remote) < 0)
+ close(tcpfd);
+ }
}
- if (pollfds[UDP_SOCK].revents) {
- Client_read_udp(udpsocks[0]);
- }
- if (pollfds[UDP_SOCK6].revents) {
- Client_read_udp(udpsocks[1]);
+ for (i = nofServerSocks / 2; i < nofServerSocks; i++) {
+ if (pollfds[i].revents)
+ Client_read_udp(udpsocks[i - nofServerSocks / 2]);
}
+
for (i = 0; i < clientcount; i++) {
- if (pollfds[i + 4].revents & POLLIN) {
- Client_read_fd(pollfds[i + 4].fd);
- }
- if (pollfds[i + 4].revents & POLLOUT) {
- Client_write_fd(pollfds[i + 4].fd);
- }
+ if (pollfds[nofServerSocks + i].revents & POLLIN)
+ Client_read_fd(pollfds[nofServerSocks + i].fd);
+
+ if (pollfds[nofServerSocks + i].revents & POLLOUT)
+ Client_write_fd(pollfds[nofServerSocks + i].fd);
}
+#ifdef USE_SHAREDMEMORY_API
+ Sharedmemory_update();
+#endif
}
}
void Server_setupTCPSockets(struct sockaddr_storage* addresses[2], struct pollfd* pollfds)
{
uint8_t yes = 1;
- int error = 0;
int sockets[2];
- /* IPv4 socket setup */
- sockets[0] = socket(PF_INET, SOCK_STREAM, 0);
- if (sockets[0] < 0)
- Log_fatal("socket IPv4");
- if (setsockopt(sockets[0], SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) != 0)
- Log_fatal("setsockopt IPv4: %s", strerror(errno));
- if (bind(sockets[0], (struct sockaddr *)addresses[0], sizeof (struct sockaddr_in)) < 0)
- Log_fatal("bind IPv4: %s", strerror(errno));
- if (listen(sockets[0], 3) < 0)
- Log_fatal("listen IPv4");
- fcntl(sockets[0], F_SETFL, O_NONBLOCK);
-
- pollfds[TCP_SOCK].fd = sockets[0];
- pollfds[TCP_SOCK].events = POLLIN;
-
- /* IPv6 socket setup */
- sockets[1] = socket(PF_INET6, SOCK_STREAM, 0);
- if (sockets[1] < 0)
- Log_fatal("socket IPv6");
- if (setsockopt(sockets[1], SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) != 0)
- Log_fatal("setsockopt IPv6: %s", strerror(errno));
- if (setsockopt(sockets[1], IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(int)) != 0)
- Log_fatal("setsockopt IPv6: %s", strerror(errno));
- if (bind(sockets[1], (struct sockaddr *)addresses[1], sizeof (struct sockaddr_in6)) < 0)
- Log_fatal("bind IPv6: %s", strerror(errno));
- if (listen(sockets[1], 3) < 0)
- Log_fatal("listen IPv6");
- fcntl(sockets[1], F_SETFL, O_NONBLOCK);
-
- pollfds[TCP_SOCK6].fd = sockets[1];
- pollfds[TCP_SOCK6].events = POLLIN;
+ if (hasv4) {
+ /* IPv4 socket setup */
+ sockets[0] = socket(PF_INET, SOCK_STREAM, 0);
+ if (sockets[0] < 0)
+ Log_fatal("socket IPv4");
+ if (setsockopt(sockets[0], SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) != 0)
+ Log_fatal("setsockopt IPv4: %s", strerror(errno));
+ if (bind(sockets[0], (struct sockaddr *)addresses[0], sizeof (struct sockaddr_in)) < 0) {
+ char *addressString = Util_addressToString(addresses[0]);
+ Log_fatal("bind %s %d: %s", addressString, Util_addressToPort(addresses[0]), strerror(errno));
+ free(addressString);
+ }
+ if (listen(sockets[0], 3) < 0)
+ Log_fatal("listen IPv4");
+ fcntl(sockets[0], F_SETFL, O_NONBLOCK);
+
+ pollfds[0].fd = sockets[0];
+ pollfds[0].events = POLLIN;
+ }
+
+ if (hasv6) {
+ /* IPv6 socket setup */
+ sockets[1] = socket(PF_INET6, SOCK_STREAM, 0);
+ if (sockets[1] < 0)
+ Log_fatal("socket IPv6: %s", strerror(errno));
+ if (setsockopt(sockets[1], SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) != 0)
+ Log_fatal("setsockopt IPv6: %s", strerror(errno));
+ if (setsockopt(sockets[1], IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(int)) != 0)
+ Log_fatal("setsockopt IPv6: %s", strerror(errno));
+ if (bind(sockets[1], (struct sockaddr *)addresses[1], sizeof (struct sockaddr_in6)) < 0) {
+ char *addressString = Util_addressToString(addresses[1]);
+ Log_fatal("bind %s %d: %s", addressString, Util_addressToPort(addresses[1]), strerror(errno));
+ free(addressString);
+ }
+ if (listen(sockets[1], 3) < 0)
+ Log_fatal("listen IPv6");
+ fcntl(sockets[1], F_SETFL, O_NONBLOCK);
+
+
+ /* If there is an IPv4 address, then IPv6 will use the second socket, otherwise it uses the first */
+ pollfds[(hasv4) ? 1 : 0].fd = sockets[1];
+ pollfds[(hasv4) ? 1 : 0].events = POLLIN;
+ }
}
void Server_setupUDPSockets(struct sockaddr_storage* addresses[2], struct pollfd* pollfds)
{
- uint8_t yes = 1;
int val = 0;
- int error = 0;
- int sockets[2];
- char ipv6Representation[INET6_ADDRSTRLEN];
+ int sockets[2] = {-1, -1};
- if((udpsocks = malloc(2 * sizeof(int))) == NULL)
+ if((udpsocks = calloc(nofServerSocks / 2, sizeof(int))) == NULL)
Log_fatal("Out of memory (%s:%s)", __FILE__, __LINE__);
- inet_ntop(AF_INET6, &((struct sockaddr_in6*)addresses[1])->sin6_addr, ipv6Representation, sizeof(INET6_ADDRSTRLEN));
-
- sockets[0] = socket(PF_INET, SOCK_DGRAM, 0);
- if (bind(sockets[0], (struct sockaddr *) addresses[0], sizeof (struct sockaddr_in)) < 0)
- Log_fatal("bind %d %s: %s", ((struct sockaddr_in*)addresses[0])->sin_port,
- inet_ntoa(((struct sockaddr_in*)addresses[0])->sin_addr), strerror(errno));
- val = 0xe0;
- if (setsockopt(sockets[0], IPPROTO_IP, IP_TOS, &val, sizeof(val)) < 0)
- Log_warn("Server: Failed to set TOS for UDP Socket");
- val = 0x80;
- if (setsockopt(sockets[0], IPPROTO_IP, IP_TOS, &val, sizeof(val)) < 0)
- Log_warn("Server: Failed to set TOS for UDP Socket");
-
- fcntl(sockets[0], F_SETFL, O_NONBLOCK);
- pollfds[UDP_SOCK].fd = sockets[0];
- pollfds[UDP_SOCK].events = POLLIN | POLLHUP | POLLERR;
-
- sockets[1] = socket(PF_INET6, SOCK_DGRAM, 0);
- if (setsockopt(sockets[1], IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(int)) != 0)
- Log_fatal("setsockopt IPv6: %s", strerror(errno));
- if (bind(sockets[1], (struct sockaddr *) addresses[1], sizeof (struct sockaddr_in6)) < 0)
- Log_fatal("bind %d %s: %s", ((struct sockaddr_in*)addresses[1])->sin_port, ipv6Representation, strerror(errno));
- val = 0xe0;
- if (setsockopt(sockets[1], IPPROTO_IPV6, IPV6_TCLASS, &val, sizeof(val)) < 0)
- Log_warn("Server: Failed to set TOS for UDP Socket");
- val = 0x80;
- if (setsockopt(sockets[1], IPPROTO_IPV6, IPV6_TCLASS, &val, sizeof(val)) < 0)
- Log_warn("Server: Failed to set TOS for UDP Socket");
-
- fcntl(sockets[1], F_SETFL, O_NONBLOCK);
- pollfds[UDP_SOCK6].fd = sockets[1];
- pollfds[UDP_SOCK6].events = POLLIN | POLLHUP | POLLERR;
- udpsocks[0] = sockets[0];
- udpsocks[1] = sockets[1];
+ if (hasv4) {
+ sockets[0] = socket(PF_INET, SOCK_DGRAM, 0);
+ if (bind(sockets[0], (struct sockaddr *) addresses[0], sizeof (struct sockaddr_in)) < 0) {
+ char *addressString = Util_addressToString(addresses[0]);
+ Log_fatal("bind %s %d: %s", addressString, Util_addressToPort(addresses[0]), strerror(errno));
+ free(addressString);
+ }
+ val = 0xe0;
+ if (setsockopt(sockets[0], IPPROTO_IP, IP_TOS, &val, sizeof(val)) < 0)
+ Log_warn("Server: Failed to set TOS for UDP Socket");
+ val = 0x80;
+ if (setsockopt(sockets[0], IPPROTO_IP, IP_TOS, &val, sizeof(val)) < 0)
+ Log_warn("Server: Failed to set TOS for UDP Socket");
+
+ fcntl(sockets[0], F_SETFL, O_NONBLOCK);
+ pollfds[(hasv6) ? 2 : 1].fd = sockets[0];
+ pollfds[(hasv6) ? 2 : 1].events = POLLIN | POLLHUP | POLLERR;
+ udpsocks[0] = sockets[0];
+ }
+
+ if (hasv6) {
+ sockets[1] = socket(PF_INET6, SOCK_DGRAM, 0);
+ if (setsockopt(sockets[1], IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(int)) != 0)
+ Log_fatal("setsockopt IPv6: %s", strerror(errno));
+ if (bind(sockets[1], (struct sockaddr *) addresses[1], sizeof (struct sockaddr_in6)) < 0) {
+ char *addressString = Util_addressToString(addresses[1]);
+ Log_fatal("bind %s %d: %s", addressString, Util_addressToPort(addresses[1]), strerror(errno));
+ free(addressString);
+ }
+ val = 0xe0;
+ if (setsockopt(sockets[1], IPPROTO_IPV6, IPV6_TCLASS, &val, sizeof(val)) < 0)
+ Log_warn("Server: Failed to set TOS for UDP Socket");
+ val = 0x80;
+ if (setsockopt(sockets[1], IPPROTO_IPV6, IPV6_TCLASS, &val, sizeof(val)) < 0)
+ Log_warn("Server: Failed to set TOS for UDP Socket");
+
+ fcntl(sockets[1], F_SETFL, O_NONBLOCK);
+ pollfds[(hasv4) ? 3 : 1].fd = sockets[1];
+ pollfds[(hasv4) ? 3 : 1].events = POLLIN | POLLHUP | POLLERR;
+ udpsocks[(hasv4) ? 1 : 0] = sockets[1];
+ }
+
}
void Server_run()
{
struct pollfd *pollfds;
- /* max clients + listen sock + udp sock + client connecting that will be disconnected */
- if ((pollfds = calloc((getIntConf(MAX_CLIENTS) + 5) , sizeof(struct pollfd))) == NULL)
+ checkIPversions();
+
+ /* max clients + server sokets + client connecting that will be disconnected */
+ if ((pollfds = calloc((getIntConf(MAX_CLIENTS) + nofServerSocks + 1) , sizeof(struct pollfd))) == NULL)
Log_fatal("out of memory");
/* Figure out bind address and port */
projects / umurmur.git / blobdiff