diff options
| author |   jakob <jakob@openbsd.org> | 2012-01-29 11:23:24 +0000 |
|---|---|---|
| committer | jakob <jakob@openbsd.org> | 2012-01-29 11:23:24 +0000 |
| commit | 5bcb494be38ba5295a64197d7f25257138734657 (patch) | |
| tree | 0a3bffd3fd03f22f843e0b2dc8cfcf29d620ba7f /usr.sbin/nsd/server.c | |
| parent | regen (diff) | |
| download | wireguard-openbsd-5bcb494be38ba5295a64197d7f25257138734657.tar.xz wireguard-openbsd-5bcb494be38ba5295a64197d7f25257138734657.zip | |
resolve conflicts
Diffstat (limited to 'usr.sbin/nsd/server.c')
| -rw-r--r-- | usr.sbin/nsd/server.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/usr.sbin/nsd/server.c b/usr.sbin/nsd/server.c index 28ba14353c4..ed81863ddb1 100644 --- a/usr.sbin/nsd/server.c +++ b/usr.sbin/nsd/server.c @@ -83,32 +83,32 @@ struct tcp_handler_data * data, including this structure. This region is destroyed * when the connection is closed. */ - region_type* region; + region_type *region; /* * The global nsd structure. */ - struct nsd* nsd; + struct nsd *nsd; /* * The current query data for this TCP connection. */ - query_type* query; + query_type *query; /* * These fields are used to enable the TCP accept handlers * when the number of TCP connection drops below the maximum * number of TCP connections. */ - size_t tcp_accept_handler_count; - netio_handler_type* tcp_accept_handlers; + size_t tcp_accept_handler_count; + netio_handler_type *tcp_accept_handlers; /* * The query_state is used to remember if we are performing an * AXFR, if we're done processing, or if we should discard the * query and connection. */ - query_state_type query_state; + query_state_type query_state; /* * The bytes_transmitted field is used to remember the number @@ -116,7 +116,7 @@ struct tcp_handler_data * packet. The count includes the two additional bytes used * to specify the packet length on a TCP connection. */ - size_t bytes_transmitted; + size_t bytes_transmitted; /* * The number of queries handled by this specific TCP connection. @@ -759,7 +759,9 @@ server_reload(struct nsd *nsd, region_type* server_region, netio_type* netio, region_log_stats(nsd->db->region); #endif /* NDEBUG */ #ifdef NSEC3 +#ifdef FULL_PREHASH prehash(nsd->db, 1); +#endif /* FULL_PREHASH */ #endif /* NSEC3 */ initialize_dname_compression_tables(nsd); @@ -1678,6 +1680,9 @@ handle_tcp_writing(netio_type *netio, #ifdef ECONNRESET if(verbosity >= 2 || errno != ECONNRESET) #endif /* ECONNRESET */ +#ifdef EPIPE + if(verbosity >= 2 || errno != EPIPE) +#endif /* EPIPE 'broken pipe' */ log_msg(LOG_ERR, "failed writing to tcp: %s", strerror(errno)); cleanup_tcp_handler(netio, handler); return; @@ -1712,6 +1717,9 @@ handle_tcp_writing(netio_type *netio, #ifdef ECONNRESET if(verbosity >= 2 || errno != ECONNRESET) #endif /* ECONNRESET */ +#ifdef EPIPE + if(verbosity >= 2 || errno != EPIPE) +#endif /* EPIPE 'broken pipe' */ log_msg(LOG_ERR, "failed writing to tcp: %s", strerror(errno)); cleanup_tcp_handler(netio, handler); return; |