webserver: comparison src/server/daemon/httplistener.c

-:224c4e858125
+:77d81f2bb9f7
 #include <sys/shm.h>
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/socket.h>
 #include <sys/file.h>
+#include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <strings.h>
 #include <stdbool.h>
 #include <pthread.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <unistd.h>
 #include <ucx/map.h>
 #include "../util/atomic.h"
 #include "httplistener.h"
 #include "netsite.h"
 newls->cfg = conf->cfg;
 newls->nacceptors = conf->nacceptors;
 newls->default_vs.vs_name = conf->vs.ptr;
 newls->port = fl->port;
 newls->server_socket = fl->server_socket;
+newls->server_socket6 = fl->server_socket6;
 newls->running = 1;
 newls->threadpool = NULL;
 newls->ref = 2; // 1 reference is fl->next
 newls->session_handler = fl->session_handler; // TODO
 newls->acceptors = calloc(newls->nacceptors, sizeof(void*));
 for (int i=0;i<newls->nacceptors;i++) {
 newls->acceptors[i] = acceptor_new(newls);
 }
+newls->acceptors6 = calloc(newls->nacceptors, sizeof(void*));
+for (int i=0;i<newls->nacceptors;i++) {
+newls->acceptors6[i] = acceptor_new(newls);
+newls->acceptors6[i]->ipv6 = TRUE;
+}
 // fl hold one reference of newls
 fl->next = newls;
 ucx_map_sstr_put(listener_map, newls->name, newls);
 for (int i=0;i<newls->nacceptors;i++) {
-acceptor_start(newls->acceptors[i]);
+//acceptor_start(newls->acceptors[i]);
+acceptor_start(newls->acceptors6[i]);
 }
 // check if a restart is required to apply all changes
 if(newls->port != conf->port) {
 ucx_map_sstr_put(listener_map, listener->name, listener);
 struct sockaddr_in servaddr;   /* server address */
+struct sockaddr_in6 servaddr6;
 /* init address structure */
 memset(&servaddr, 0, sizeof(servaddr));
 servaddr.sin_family = AF_INET;
 servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
 servaddr.sin_port = htons(conf->port);
+memset(&servaddr6, 0, sizeof(servaddr6));
+servaddr6.sin6_family = AF_INET6;
+servaddr6.sin6_addr = in6addr_any;
+servaddr6.sin6_port = htons(conf->port);
 /* create socket */
 if((listener->server_socket = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
 perror("Error: http_listener_new: socket");
+return NULL;
+}
+if((listener->server_socket6 = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP)) == -1) {
+perror("Error: http_listener_new: socket v6");
 return NULL;
 }
 int o = 1;
 setsockopt(
 listener->server_socket,
 SOL_SOCKET, SO_REUSEADDR,
 &o,
 sizeof(int));
+o = 1;
+setsockopt(
+listener->server_socket6,
+SOL_SOCKET, SO_REUSEADDR,
+&o,
+sizeof(int));
 /* bind server socket to address */
 if(bind(listener->server_socket, (struct sockaddr*)&servaddr, sizeof(servaddr))){
 log_ereport(LOG_FAILURE, "http_listener_new: bind failed. Port: %d", conf->port);
 return NULL;
 }
+if(bind(listener->server_socket6, (struct sockaddr*)&servaddr6, sizeof(servaddr6))){
+log_ereport(LOG_FAILURE, "http_listener_new: bind v6 failed. Port: %d: %s", conf->port, strerror(errno));
+return NULL;
+}
 /* create acceptors */
 listener->acceptors = calloc(listener->nacceptors, sizeof(void*));
+listener->acceptors6 = calloc(listener->nacceptors, sizeof(void*));
 for (int i=0;i<listener->nacceptors;i++) {
 listener->acceptors[i] = acceptor_new(listener);
+listener->acceptors6[i] = acceptor_new(listener);
+listener->acceptors6[i]->ipv6 = TRUE;
 }
 return listener;
 }
 if (listen(listener->server_socket, 256) == -1) {
 log_ereport(LOG_FAILURE, "http_listener_start: listen failed");
 return -1;
 }
+if (listen(listener->server_socket6, 256) == -1) {
+log_ereport(LOG_FAILURE, "http_listener_start: listen failed");
+return -1;
+}
 /* start acceptor threads */
 for (int i=0;i<listener->nacceptors;i++) {
 acceptor_start(listener->acceptors[i]);
+acceptor_start(listener->acceptors6[i]);
 }
 return 0;
 }
 Acceptor* acceptor_new(HttpListener *listener) {
 Acceptor *acceptor = malloc(sizeof(Acceptor));
 acceptor->listener = listener;
+acceptor->ipv6 = WS_FALSE;
 return acceptor;
 }
 void acceptor_start(Acceptor *a) {
 if(pthread_create(
 WS_ASSERT(acceptor->listener->session_handler);
 WS_ASSERT(acceptor->listener->session_handler->enqueue_connection);
 HttpListener *listener = acceptor->listener;
+int server_socket;
+ConnectionAddr ca;
+struct sockaddr *ca_ptr;
+socklen_t ca_length;
+ConnectionAddrType addr_type;
+if(acceptor->ipv6) {
+server_socket = listener->server_socket6;
+ca_ptr = (struct sockaddr*)&ca.address_v6;
+ca_length = sizeof(ca.address_v6);
+addr_type = CONN_ADDR_IPV6;
+} else {
+server_socket = listener->server_socket;
+ca_ptr = (struct sockaddr*)&ca.address_v4;
+ca_length = sizeof(ca.address_v4);
+addr_type = CONN_ADDR_IPV4;
+}
 for (;;) {
 /* accept connections */
-struct sockaddr_in ca;
-socklen_t length = sizeof(ca);
 int clientfd;
+socklen_t length = ca_length;
 /* accept a connection */
 clientfd = accept(
-listener->server_socket,
+server_socket,
-(struct sockaddr*)&ca,
+ca_ptr,
 &length);
 if (clientfd == -1) {
-perror("Error: acceptor_thread: accept");
+log_ereport(LOG_FAILURE, "accept %s failed: %s", acceptor->ipv6 ? "ipv6" : "ipv4", strerror(errno));
 continue;
 }
 // check listener
 HttpListener *ls = listener;
 }
 /* create Connection object */
 Connection *conn = malloc(sizeof(Connection));
 conn->address = ca;
+conn->addr_type = addr_type;
 conn->fd = clientfd;
 conn->listener = ls;
 conn->ssl_accepted = 0;
 if(ls->ssl) {
 // SSL connections are always non-blocking

Mercurial > hg > webserver / file comparison

comparison: src/server/daemon/httplistener.c

src/server/daemon/httplistener.c