Commit Diff
Diff:
8553d61fccf35aa43801fb235c3bfaa51c4416a8
555f9cdc93c07d728d0b5037494a0d7e513d4add
Commit:
555f9cdc93c07d728d0b5037494a0d7e513d4add
Tree:
1d7c8a9a99462b68089ed7e7d88f52fbbf0dd41e
Author:
pjp <pjp@delphinusdns.org>
Committer:
pjp <pjp@delphinusdns.org>
Date:
Thu Jun 6 14:56:08 2019 UTC
Message:
each .c file has now it's own #include instead of including ddd-include.h which is moved to the attic.
blob - adbdc408fdd72aa94ee2bc5654df5b69760a916c
blob + 45127c8f05af9648c06a3d4df91fd4882e064588
--- additional.c
+++ additional.c
@@ -27,10 +27,36 @@
*/
/*
- * $Id: additional.c,v 1.26 2019/03/01 05:36:50 pjp Exp $
+ * $Id: additional.c,v 1.27 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#endif /* __linux__ */
+
+
#include "ddd-dns.h"
#include "ddd-db.h"
blob - 8270fabc33f39233185b1b184206d24c6086a5de
blob + 9e3be757dbeb720983ab3088003f4469c540f56c
--- axfr.c
+++ axfr.c
@@ -27,10 +27,47 @@
*/
/*
- * $Id: axfr.c,v 1.26 2019/04/25 05:54:09 pjp Exp $
+ * $Id: axfr.c,v 1.27 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/wait.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <errno.h>
+#include <signal.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#ifdef __FreeBSD__
+#include "imsg.h"
+#else
+#include <imsg.h>
+#endif /* __FreeBSD__ */
+#endif /* __linux__ */
+
+
#include "ddd-dns.h"
#include "ddd-db.h"
blob - 244404fbdba1d4c2d8011a92c0de6aeb492a939c
blob + f28baa2d7a250f52cde48b7d39aec27a014d48c7
--- db.c
+++ db.c
@@ -27,10 +27,38 @@
*/
/*
- * $Id: db.c,v 1.12 2019/04/25 05:54:09 pjp Exp $
+ * $Id: db.c,v 1.13 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <time.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#endif /* __linux__ */
+
+
#include "ddd-dns.h"
#include "ddd-db.h"
blob - 49f76418d4e2b8352a3c1e6c9b6ecda22b5b2a7c (mode 644)
blob + /dev/null
--- ddd-include.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2005-2019 Peter J. Philipp
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/*
- * $Id: ddd-include.h,v 1.10 2019/04/25 05:54:09 pjp Exp $
- */
-
-#ifndef _INCLUDES_H
-#define _INCLUDES_H
-
-#include <sys/param.h>
-#include <sys/ipc.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <sys/queue.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <sys/un.h>
-
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/udp.h>
-#define _KERNEL 1
-#include <netinet/ip6.h>
-#undef _KERNEL
-
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <syslog.h>
-#include <ctype.h>
-#include <pwd.h>
-#include <ifaddrs.h>
-#include <dirent.h>
-#include <signal.h>
-#include <time.h>
-
-#ifdef __linux__
-#include <grp.h>
-#define __USE_BSD 1
-#include <endian.h>
-#include <bsd/stdlib.h>
-#include <bsd/string.h>
-#include <bsd/unistd.h>
-#include <bsd/sys/queue.h>
-#define __unused
-#include <bsd/sys/tree.h>
-#include <bsd/sys/endian.h>
-#include "imsg.h"
-#else
-#include <sys/queue.h>
-#include <sys/tree.h>
-#ifdef __FreeBSD__
-#include "imsg.h"
-#else
-#include <imsg.h>
-#endif
-#endif
-
-#ifndef NTOHS
-#include "endian.h"
-#endif
-
-#endif
blob - 431e443cf3bf2277d565d29ee2fa0fa47af75710
blob + 941f5d517fafa707d76a6c3392ba9209ad0bd3b2
--- dddctl.c
+++ dddctl.c
@@ -27,14 +27,61 @@
*/
/*
- * $Id: dddctl.c,v 1.62 2019/04/30 10:21:00 pjp Exp $
+ * $Id: dddctl.c,v 1.63 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
-#include "ddd-dns.h"
-#include "ddd-db.h"
-#include "ddd-config.h"
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/uio.h>
+#include <sys/wait.h>
+#include <sys/un.h>
+#include <net/if.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <syslog.h>
+#include <ctype.h>
+#include <pwd.h>
+#include <ifaddrs.h>
+#include <dirent.h>
+#include <signal.h>
+#include <time.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/unistd.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#include "imsg.h"
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#ifdef __FreeBSD__
+#include "imsg.h"
+#else
+#include <imsg.h>
+#endif /* __FreeBSD__ */
+#endif /* __linux__ */
+
#include <openssl/bn.h>
#include <openssl/obj_mac.h>
#include <openssl/rsa.h>
@@ -44,6 +91,9 @@
#include <openssl/evp.h>
#include <openssl/hmac.h>
+#include "ddd-dns.h"
+#include "ddd-db.h"
+#include "ddd-config.h"
int debug = 0;
int verbose = 0;
blob - 854e6492fef022ce2b2fcbce28535483d09c75b8
blob + 5bfab49adc82f3d90bfe1af675076af9042f44a1
--- delphinusdnsd.c
+++ delphinusdnsd.c
@@ -27,10 +27,64 @@
*/
/*
- * $Id: delphinusdnsd.c,v 1.61 2019/04/25 05:54:09 pjp Exp $
+ * $Id: delphinusdnsd.c,v 1.62 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/uio.h>
+#include <sys/queue.h>
+#include <sys/mman.h>
+#include <sys/wait.h>
+#include <sys/un.h>
+
+#include <net/if.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <syslog.h>
+#include <ctype.h>
+#include <pwd.h>
+#include <ifaddrs.h>
+#include <dirent.h>
+#include <signal.h>
+#include <time.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/unistd.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#include "imsg.h"
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#ifdef __FreeBSD__
+#include "imsg.h"
+#else
+#include <imsg.h>
+#endif /* __FreeBSD__ */
+#endif /* __linux__ */
+
#include "ddd-dns.h"
#include "ddd-db.h"
#include "ddd-config.h"
blob - 05321c9ebab13d424522da767cc5ad078da70010
blob + 340789477319b16b4c1b34c060bdbcd23bb11881
--- dnssec.c
+++ dnssec.c
@@ -27,10 +27,47 @@
*/
/*
- * $Id: dnssec.c,v 1.23 2019/02/26 07:45:56 pjp Exp $
+ * $Id: dnssec.c,v 1.24 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/wait.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <errno.h>
+#include <signal.h>
+#include <ctype.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#ifdef __FreeBSD__
+#include "imsg.h"
+#else
+#include <imsg.h>
+#endif /* __FreeBSD__ */
+#endif /* __linux__ */
+
#include "ddd-dns.h"
#include "ddd-db.h"
blob - 4b619966415aa0c67304c5fafe4daa4d4dceef5d
blob + 7d418f3371be1ed665077a9f1cd1521302c76e9b
--- ent.c
+++ ent.c
@@ -27,14 +27,42 @@
*/
/*
- * $Id: ent.c,v 1.9 2019/02/19 11:49:54 pjp Exp $
+ * $Id: ent.c,v 1.10 2019/06/06 14:56:08 pjp Exp $
*/
/*
* this file is based on whitelist.c
*/
-#include "ddd-include.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <syslog.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#endif /* __linux__ */
+
+
#include "ddd-dns.h"
#include "ddd-db.h"
blob - 775e6953213a3263275833db5126153a5409cdee
blob + ea56fdbf7e76d18373a4c948afa2339d02df1ebd
--- filter.c
+++ filter.c
@@ -27,10 +27,39 @@
*/
/*
- * $Id: filter.c,v 1.5 2018/10/19 08:24:48 pjp Exp $
+ * $Id: filter.c,v 1.6 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <syslog.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#endif /* __linux__ */
+
+
+
#include "ddd-dns.h"
#include "ddd-db.h"
blob - 305d488466b370e7a6f8d0560901cc4b126da3be
blob + e8c65b258e68d042b900874df94e8a8242aa56a8
--- log.c
+++ log.c
@@ -27,16 +27,43 @@
*/
/*
- * $Id: log.c,v 1.5 2018/10/19 08:24:48 pjp Exp $
+ * $Id: log.c,v 1.6 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
-#include "ddd-dns.h"
-#include "ddd-db.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <syslog.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#endif /* __linux__ */
+
#include <openssl/evp.h>
#include <openssl/hmac.h>
+
+#include "ddd-dns.h"
+#include "ddd-db.h"
extern struct logging logging;
extern int debug;
blob - 220463a6bb946ec865da03684c545bd1d39bc9aa
blob + 316371939e02c75a733b1153a6d8b9931859223b
--- parse.y
+++ parse.y
@@ -21,11 +21,49 @@
*/
/*
- * $Id: parse.y,v 1.67 2019/04/30 10:21:00 pjp Exp $
+ * $Id: parse.y,v 1.68 2019/06/06 14:56:08 pjp Exp $
*/
%{
-#include "ddd-include.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <syslog.h>
+#include <ctype.h>
+#include <signal.h>
+#include <time.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/unistd.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#endif /* __linux__ */
+
+
#include "ddd-dns.h"
#include "ddd-db.h"
blob - 4e3eca7761683721394c5226e6f1d00f18c34798
blob + c501c5c418671174d0ce87487d77888eea16a759
--- ratelimit.c
+++ ratelimit.c
@@ -27,10 +27,39 @@
*/
/*
- * $Id: ratelimit.c,v 1.6 2019/02/28 05:03:34 pjp Exp $
+ * $Id: ratelimit.c,v 1.7 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/mman.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <syslog.h>
+#include <time.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#endif /* __linux__ */
+
#include "ddd-dns.h"
#include "ddd-db.h"
blob - 5a32d131cdc6062a9d015a638543a535ca29e4ff
blob + bb854dcc3ba1039797ced97b9668d9148b22822e
--- raxfr.c
+++ raxfr.c
@@ -26,10 +26,38 @@
*
*/
/*
- * $Id: raxfr.c,v 1.12 2019/04/30 10:21:00 pjp Exp $
+ * $Id: raxfr.c,v 1.13 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#endif /* __linux__ */
+
+
#include "ddd-dns.h"
#include "ddd-db.h"
blob - 891c566b76ae34533248be1fb9a7cf45191d4806
blob + 24432a0635747e3e6a672c3b34808e0ac304510b
--- region.c
+++ region.c
@@ -27,10 +27,37 @@
*/
/*
- * $Id: region.c,v 1.6 2018/10/19 08:24:48 pjp Exp $
+ * $Id: region.c,v 1.7 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <syslog.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#endif /* __linux__ */
+
#include "ddd-dns.h"
#include "ddd-db.h"
blob - 8c764ed5cd4bc0c67bb3d92ccd4f1ea1e15eb446
blob + 6c9df0f16076c7145fa3d11b7217445115952370
--- reply.c
+++ reply.c
@@ -27,16 +27,43 @@
*/
/*
- * $Id: reply.c,v 1.78 2019/04/30 10:57:59 pjp Exp $
+ * $Id: reply.c,v 1.79 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
-#include "ddd-dns.h"
-#include "ddd-db.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <syslog.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#endif /* __linux__ */
+
+
#include <openssl/evp.h>
#include <openssl/hmac.h>
+#include "ddd-dns.h"
+#include "ddd-db.h"
/* prototypes */
blob - caaa7d175fce31d3b1de801ca294a2b0f310d333
blob + 02c99ded6cbf41b03084d749b5d5ef6ff5b41426
--- tsig.c
+++ tsig.c
@@ -27,7 +27,7 @@
*/
/*
- * $Id: tsig.c,v 1.1 2019/02/24 07:14:02 pjp Exp $
+ * $Id: tsig.c,v 1.2 2019/06/06 14:56:08 pjp Exp $
*/
@@ -35,7 +35,32 @@
* this file is based on filter.c
*/
-#include "ddd-include.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#endif /* __linux__ */
+
#include "ddd-dns.h"
#include "ddd-db.h"
blob - 89fe2b1aaf82a1f11ba7ed5ff23f717b1a222f41
blob + a5be26bce1cd06f2a8c188b25d62f388a0b0f124
--- util.c
+++ util.c
@@ -27,19 +27,57 @@
*/
/*
- * $Id: util.c,v 1.30 2019/04/25 05:54:09 pjp Exp $
+ * $Id: util.c,v 1.31 2019/06/06 14:56:08 pjp Exp $
*/
-#include "ddd-include.h"
-#include "ddd-dns.h"
-#include "ddd-db.h"
-#include "ddd-config.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <string.h>
+#include <errno.h>
+#include <syslog.h>
+#include <unistd.h>
+#include <ctype.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/unistd.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#include "imsg.h"
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#ifdef __FreeBSD__
+#include "imsg.h"
+#else
+#include <imsg.h>
+#endif /* __FreeBSD__ */
+#endif /* __linux__ */
+
+
#include <openssl/evp.h>
#include <openssl/hmac.h>
-/* prototypes */
+#include "ddd-dns.h"
+#include "ddd-db.h"
+#include "ddd-config.h"
+/* prototypes */
int label_count(char *);
char * dns_label(char *, int *);
blob - a355e7b4b3b403b7ac0918f1cfdd75aac117ee3c
blob + 15686c59196ab1822fd3009fbee82eb9aae55085
--- whitelist.c
+++ whitelist.c
@@ -27,7 +27,7 @@
*/
/*
- * $Id: whitelist.c,v 1.5 2018/10/19 08:24:48 pjp Exp $
+ * $Id: whitelist.c,v 1.6 2019/06/06 14:56:08 pjp Exp $
*/
@@ -35,7 +35,34 @@
* this file is based on filter.c
*/
-#include "ddd-include.h"
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __linux__
+#include <grp.h>
+#define __USE_BSD 1
+#include <endian.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+#include <bsd/sys/queue.h>
+#define __unused
+#include <bsd/sys/tree.h>
+#include <bsd/sys/endian.h>
+#else /* not linux */
+#include <sys/queue.h>
+#include <sys/tree.h>
+#endif /* __linux__ */
+
+
#include "ddd-dns.h"
#include "ddd-db.h"
repomaster@centroid.eu