From 4c0869845740273653c450b658a943140c13c4b7 Mon Sep 17 00:00:00 2001 From: Tomasz Konojacki Date: Mon, 15 Aug 2016 23:40:08 +0200 Subject: [PATCH] [core] DragonFlyBSD fixes - DragonFlyBSD defines __DragonFly__ macro, not __DragonflyBSD__ - dfly has TCPS_CLOSE_WAIT but it doesn't have TCP_INFO --- src/base.h | 2 +- src/configfile.c | 4 ++-- src/fdevent.c | 4 ++-- src/network.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/base.h b/src/base.h index e5db2e3..24de4a9 100644 --- a/src/base.h +++ b/src/base.h @@ -329,7 +329,7 @@ typedef struct { off_t *global_bytes_per_second_cnt_ptr; /* */ #if defined(__FreeBSD__) || defined(__NetBSD__) \ - || defined(__OpenBSD__) || defined(__DragonflyBSD__) + || defined(__OpenBSD__) || defined(__DragonFly__) buffer *bsd_accept_filter; #endif diff --git a/src/configfile.c b/src/configfile.c index e21a995..3da05ed 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -184,7 +184,7 @@ static int config_insert(server *srv) { s->ssl_ec_curve = buffer_init(); s->errorfile_prefix = buffer_init(); #if defined(__FreeBSD__) || defined(__NetBSD__) \ - || defined(__OpenBSD__) || defined(__DragonflyBSD__) + || defined(__OpenBSD__) || defined(__DragonFly__) s->bsd_accept_filter = (i == 0) ? buffer_init() : buffer_init_buffer(srv->config_storage[0]->bsd_accept_filter); @@ -285,7 +285,7 @@ static int config_insert(server *srv) { cv[70].destination = &(s->listen_backlog); cv[71].destination = s->error_handler_404; #if defined(__FreeBSD__) || defined(__NetBSD__) \ - || defined(__OpenBSD__) || defined(__DragonflyBSD__) + || defined(__OpenBSD__) || defined(__DragonFly__) cv[75].destination = s->bsd_accept_filter; #endif cv[76].destination = &(s->stream_request_body); diff --git a/src/fdevent.c b/src/fdevent.c index 756c8e6..e5d361b 100644 --- a/src/fdevent.c +++ b/src/fdevent.c @@ -254,7 +254,7 @@ int fdevent_event_next_fdndx(fdevents *ev, int ndx) { #include #if (defined(__APPLE__) && defined(__MACH__)) \ || defined(__FreeBSD__) || defined(__NetBSD__) \ - || defined(__OpenBSD__) || defined(__DragonflyBSD__) + || defined(__OpenBSD__) || defined(__DragonFly__) #include #endif @@ -265,7 +265,7 @@ int fdevent_is_tcp_half_closed(int fd) { socklen_t tlen = sizeof(tcpi); return (0 == getsockopt(fd, IPPROTO_TCP, TCP_CONNECTION_INFO, &tcpi, &tlen) && tcpi.tcpi_state == TCPS_CLOSE_WAIT); - #elif defined(TCPS_CLOSE_WAIT) /* FreeBSD, NetBSD (not present in OpenBSD) */ + #elif defined(TCPS_CLOSE_WAIT) && defined(TCP_INFO) /* FreeBSD, NetBSD (not present in OpenBSD) */ struct tcp_info tcpi; socklen_t tlen = sizeof(tcpi); return (0 == getsockopt(fd, IPPROTO_TCP, TCP_INFO, &tcpi, &tlen) diff --git a/src/network.c b/src/network.c index dfa80a4..574a007 100644 --- a/src/network.c +++ b/src/network.c @@ -495,7 +495,7 @@ static int network_server_init(server *srv, buffer *host_token, specific_config } #endif #if defined(__FreeBSD__) || defined(__NetBSD__) \ - || defined(__OpenBSD__) || defined(__DragonflyBSD__) + || defined(__OpenBSD__) || defined(__DragonFly__) } else if (!buffer_is_empty(s->bsd_accept_filter) && (buffer_is_equal_string(s->bsd_accept_filter, CONST_STR_LEN("httpready")) || buffer_is_equal_string(s->bsd_accept_filter, CONST_STR_LEN("dataready")))) { -- 2.9.0