-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
#include "log.h"
#include "timer.h"
#include "version.h"
+#include "util.h"
-#define LISTEN_SOCK 0
-#define TCP_SOCK 0
-#define UDP_SOCK 1
+#define TCP_SOCK 0
+#define TCP_SOCK6 1
+#define TCP_SOCKS 2
+#define UDP_SOCK 2
+#define UDP_SOCK6 3
+#define UDP_SOCKS 2
+#define SERVER_SOCKS UDP_SOCKS + TCP_SOCKS
/* globals */
-int udpsock;
bool_t shutdown_server;
+extern char *bindaddr;
+extern char *bindaddr6;
+extern int bindport;
+extern int bindport6;
+int* udpsocks;
-void Server_run()
+const int on = 1;
+
+/* Initialize the address structures for IPv4 and IPv6 */
+struct sockaddr_storage** Server_setupAddressesAndPorts()
{
- int timeout = 1000, rc;
- struct pollfd *pollfds;
- int tcpsock, sockopt = 1;
- struct sockaddr_in sin;
- int val, clientcount;
- etimer_t janitorTimer;
+ struct sockaddr_storage** addresses = malloc(2 * sizeof(void*));
- /* max clients + listen sock + udp sock + client connecting that will be disconnected */
- pollfds = malloc((getIntConf(MAX_CLIENTS) + 3) * sizeof(struct pollfd));
- if (pollfds == NULL)
- Log_fatal("out of memory");
-
- /* Prepare TCP socket */
- memset(&sin, 0, sizeof(sin));
- tcpsock = socket(PF_INET, SOCK_STREAM, 0);
- if (tcpsock < 0)
- Log_fatal("socket");
- if (setsockopt(tcpsock, SOL_SOCKET, SO_REUSEADDR, &sockopt, sizeof(int)) != 0)
- Log_fatal("setsockopt: %s", strerror(errno));
- sin.sin_family = AF_INET;
- sin.sin_port = htons(getIntConf(BINDPORT));
- sin.sin_addr.s_addr = inet_addr(getStrConf(BINDADDR)) == -1 ? inet_addr("0.0.0.0") : inet_addr(getStrConf(BINDADDR));
- rc = bind(tcpsock, (struct sockaddr *) &sin, sizeof (struct sockaddr_in));
- if (rc < 0) Log_fatal("bind: %s", strerror(errno));
- rc = listen(tcpsock, 3);
- if (rc < 0) Log_fatal("listen");
- fcntl(tcpsock, F_SETFL, O_NONBLOCK);
-
- pollfds[LISTEN_SOCK].fd = tcpsock;
- pollfds[LISTEN_SOCK].events = POLLIN;
-
- /* Prepare UDP socket */
- memset(&sin, 0, sizeof(sin));
- udpsock = socket(PF_INET, SOCK_DGRAM, 0);
- sin.sin_family = AF_INET;
- sin.sin_port = htons(getIntConf(BINDPORT));
- sin.sin_addr.s_addr = inet_addr(getStrConf(BINDADDR)) == -1 ? inet_addr("0.0.0.0") : inet_addr(getStrConf(BINDADDR));
- rc = bind(udpsock, (struct sockaddr *) &sin, sizeof (struct sockaddr_in));
- if (rc < 0)
- Log_fatal("bind %d %s: %s", getIntConf(BINDPORT), getStrConf(BINDADDR), strerror(errno));
- val = 0xe0;
- rc = setsockopt(udpsock, IPPROTO_IP, IP_TOS, &val, sizeof(val));
- if (rc < 0)
- Log_warn("Server: Failed to set TOS for UDP Socket");
- val = 0x80;
- rc = setsockopt(udpsock, IPPROTO_IP, IP_TOS, &val, sizeof(val));
- if (rc < 0)
- Log_warn("Server: Failed to set TOS for UDP Socket");
-
- fcntl(udpsock, F_SETFL, O_NONBLOCK);
- pollfds[UDP_SOCK].fd = udpsock;
- pollfds[UDP_SOCK].events = POLLIN | POLLHUP | POLLERR;
-
+ struct sockaddr_storage* v4address = calloc(1, sizeof(struct sockaddr_storage));
+ v4address->ss_family = AF_INET;
+ struct sockaddr_storage* v6address = calloc(1, sizeof(struct sockaddr_storage));
+ v6address->ss_family = AF_INET6;
+
+#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!");
+
+ 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!");
+
+ ((struct sockaddr_in*)v4address)->sin_port = htons((bindport) ? bindport : getIntConf(BINDPORT));
+ ((struct sockaddr_in6*)v6address)->sin6_port = htons((bindport6) ? bindport6 : getIntConf(BINDPORT6));
+
+ addresses[0] = v4address;
+ addresses[1] = v6address;
+
+ return addresses;
+}
+
+void Server_runLoop(struct pollfd* pollfds)
+{
+ int timeout, rc, clientcount;
+
+ etimer_t janitorTimer;
Timer_init(&janitorTimer);
-
- Log_info("uMurmur version %s protocol version %d.%d.%d",
- UMURMUR_VERSION, PROTVER_MAJOR, PROTVER_MINOR, PROTVER_PATCH);
- Log_info("Visit http://code.google.com/p/umurmur/");
-
- /* Main server loop */
+
while (!shutdown_server) {
- struct sockaddr_in remote;
+ struct sockaddr_storage remote;
int i;
-
+
pollfds[UDP_SOCK].revents = 0;
+ pollfds[UDP_SOCK6].revents = 0;
pollfds[TCP_SOCK].revents = 0;
- clientcount = Client_getfds(&pollfds[2]);
-
+ pollfds[TCP_SOCK6].revents = 0;
+ clientcount = Client_getfds(&pollfds[SERVER_SOCKS]);
+
timeout = (int)(1000000LL - (int64_t)Timer_elapsed(&janitorTimer)) / 1000LL;
if (timeout <= 0) {
Client_janitor();
Timer_restart(&janitorTimer);
timeout = (int)(1000000LL - (int64_t)Timer_elapsed(&janitorTimer)) / 1000LL;
}
- rc = poll(pollfds, clientcount + 2, timeout);
- if (rc == 0) { /* Timeout */
- /* Do maintenance */
+ rc = poll(pollfds, clientcount + SERVER_SOCKS, 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);
+ Log_fatal("poll: error %d (%s)", errno, strerror(errno));
}
- if (pollfds[LISTEN_SOCK].revents) { /* New tcp connection */
- int tcpfd, flag = 1;
- uint32_t addrlen;
- addrlen = sizeof(struct sockaddr_in);
- tcpfd = accept(pollfds[LISTEN_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(remote.sin_addr),
- ntohs(remote.sin_port));
- Client_add(tcpfd, &remote);
+
+ /* Check for new connection */
+ for (i = 0; i < TCP_SOCKS; i++) {
+ if (pollfds[i].revents) {
+ static int tcpfd;
+ static 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));
+ Log_debug("Connection from %s port %d\n", Util_addressToString(&remote), Util_addressToPort(&remote));
+ if (Client_add(tcpfd, &remote) < 0)
+ close(tcpfd);
+ }
}
- if (pollfds[UDP_SOCK].revents) {
- Client_read_udp();
+ for (i = 2; i < SERVER_SOCKS; i++) {
+ if (pollfds[i].revents) {
+ Client_read_udp(udpsocks[i - UDP_SOCKS]);
+ }
}
+
for (i = 0; i < clientcount; i++) {
- if (pollfds[i + 2].revents & POLLIN) {
- Client_read_fd(pollfds[i + 2].fd);
+ if (pollfds[i + 4].revents & POLLIN) {
+ Client_read_fd(pollfds[i + 4].fd);
}
- if (pollfds[i + 2].revents & POLLOUT) {
- Client_write_fd(pollfds[i + 2].fd);
+ if (pollfds[i + 4].revents & POLLOUT) {
+ Client_write_fd(pollfds[i + 4].fd);
}
}
- }
+ }
+}
+
+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 %s %d: %s", Util_addressToString(addresses[0]), Util_addressToPort(addresses[0]), 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 %s %d: %s", Util_addressToString(addresses[1]), Util_addressToPort(addresses[1]), 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;
+}
+
+void Server_setupUDPSockets(struct sockaddr_storage* addresses[2], struct pollfd* pollfds)
+{
+ int val = 0;
+ int error = 0;
+ int sockets[2];
+
+ if((udpsocks = malloc(2 * sizeof(int))) == NULL)
+ Log_fatal("Out of memory (%s:%s)", __FILE__, __LINE__);
+
+ sockets[0] = socket(PF_INET, SOCK_DGRAM, 0);
+ if (bind(sockets[0], (struct sockaddr *) addresses[0], sizeof (struct sockaddr_in)) < 0)
+ Log_fatal("bind %s %d: %s", Util_addressToString(addresses[0]), Util_addressToPort(addresses[0]), 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, &on, 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 %s %d: %s", Util_addressToString(addresses[1]), Util_addressToPort(addresses[1]), 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[UDP_SOCK - UDP_SOCKS] = sockets[0];
+ udpsocks[UDP_SOCK6 - UDP_SOCKS] = 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)
+ Log_fatal("out of memory");
+
+ /* Figure out bind address and port */
+ struct sockaddr_storage** addresses = Server_setupAddressesAndPorts();
+
+ /* Prepare TCP sockets */
+ Server_setupTCPSockets(addresses, pollfds);
+
+ /* Prepare UDP sockets */
+ Server_setupUDPSockets(addresses, pollfds);
+
+ Log_info("uMurmur version %s ('%s') protocol version %d.%d.%d",
+ UMURMUR_VERSION, UMURMUR_CODENAME, PROTVER_MAJOR, PROTVER_MINOR, PROTVER_PATCH);
+ Log_info("Visit http://code.google.com/p/umurmur/");
+
+ /* Main server loop */
+ Server_runLoop(pollfds);
- /* Disconnect clients */
+ /* Disconnect clients and cleanup memory */
Client_disconnect_all();
free(pollfds);
+ free(addresses[0]);
+ free(addresses[1]);
+ free(addresses);
+ free(udpsocks);
}
void Server_shutdown()
projects / umurmur.git / blobdiff