jcs.org / openbsd-src
jcs's openbsd hax
openbsd
fork atom

Eliminate #include inside *.h files and include only needed headers in each *.c file.

Inspired by mention of header silliness by Edgar Pettijohn and mmcc@
on tech@.

krw 837cddff 711cae1e

+351 -97
+13 -1
usr.sbin/dhcpd/alloc.c
··· 1 - /* $OpenBSD: alloc.c,v 1.13 2015/12/21 21:39:11 mmcc Exp $ */ 1 + /* $OpenBSD: alloc.c,v 1.14 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* Memory allocation... */ 4 4 ··· 40 40 * Enterprises, see ``http://www.vix.com''. 41 41 */ 42 42 43 + #include <sys/types.h> 44 + #include <sys/socket.h> 45 + 46 + #include <net/if.h> 47 + 48 + #include <netinet/in.h> 49 + 50 + #include <stdio.h> 51 + #include <stdlib.h> 52 + 53 + #include "dhcp.h" 54 + #include "tree.h" 43 55 #include "dhcpd.h" 44 56 45 57 struct lease_state *free_lease_states;
+15 -1
usr.sbin/dhcpd/bootp.c
··· 1 - /* $OpenBSD: bootp.c,v 1.15 2014/07/11 09:42:27 yasuoka Exp $ */ 1 + /* $OpenBSD: bootp.c,v 1.16 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * BOOTP Protocol support. ··· 42 42 * Enterprises, see ``http://www.vix.com''. 43 43 */ 44 44 45 + #include <sys/socket.h> 46 + 47 + #include <arpa/inet.h> 48 + 49 + #include <net/if.h> 50 + 51 + #include <netinet/in.h> 52 + 53 + #include <errno.h> 54 + #include <stdio.h> 55 + #include <string.h> 56 + 57 + #include "dhcp.h" 58 + #include "tree.h" 45 59 #include "dhcpd.h" 46 60 47 61 void
+19 -5
usr.sbin/dhcpd/bpf.c
··· 1 - /* $OpenBSD: bpf.c,v 1.12 2014/10/25 03:23:49 lteo Exp $ */ 1 + /* $OpenBSD: bpf.c,v 1.13 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* BPF socket interface code, originally contributed by Archie Cobbs. */ 4 4 ··· 40 40 * Enterprises, see ``http://www.vix.com''. 41 41 */ 42 42 43 - #include "dhcpd.h" 44 43 #include <sys/ioctl.h> 45 - #include <sys/uio.h> 44 + #include <sys/types.h> 45 + #include <sys/socket.h> 46 + 47 + #include <arpa/inet.h> 46 48 47 49 #include <net/bpf.h> 48 - #include <netinet/ip.h> 49 - #include <netinet/udp.h> 50 + #include <net/if.h> 51 + 50 52 #include <netinet/if_ether.h> 53 + #include <netinet/in.h> 54 + 55 + #include <errno.h> 56 + #include <fcntl.h> 57 + #include <stdio.h> 58 + #include <stdlib.h> 59 + #include <string.h> 60 + #include <unistd.h> 61 + 62 + #include "dhcp.h" 63 + #include "tree.h" 64 + #include "dhcpd.h" 51 65 52 66 #define BPF_FORMAT "/dev/bpf%d" 53 67
+13 -1
usr.sbin/dhcpd/conflex.c
··· 1 - /* $OpenBSD: conflex.c,v 1.15 2015/05/18 17:51:21 krw Exp $ */ 1 + /* $OpenBSD: conflex.c,v 1.16 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* Lexical scanner for dhcpd config file... */ 4 4 ··· 40 40 * Enterprises, see ``http://www.vix.com''. 41 41 */ 42 42 43 + #include <sys/types.h> 44 + #include <sys/socket.h> 45 + 46 + #include <net/if.h> 47 + 48 + #include <netinet/in.h> 49 + 43 50 #include <ctype.h> 51 + #include <stdio.h> 52 + #include <stdlib.h> 53 + #include <string.h> 44 54 55 + #include "dhcp.h" 56 + #include "tree.h" 45 57 #include "dhcpd.h" 46 58 #include "dhctoken.h" 47 59
+13 -1
usr.sbin/dhcpd/confpars.c
··· 1 - /* $OpenBSD: confpars.c,v 1.25 2015/08/20 22:39:29 deraadt Exp $ */ 1 + /* $OpenBSD: confpars.c,v 1.26 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1995, 1996, 1997 The Internet Software Consortium. ··· 38 38 * Enterprises, see ``http://www.vix.com''. 39 39 */ 40 40 41 + #include <sys/types.h> 42 + #include <sys/socket.h> 43 + 44 + #include <net/if.h> 45 + 46 + #include <netdb.h> 47 + #include <stdio.h> 48 + #include <stdlib.h> 49 + #include <string.h> 50 + 51 + #include "dhcp.h" 52 + #include "tree.h" 41 53 #include "dhcpd.h" 42 54 #include "dhctoken.h" 43 55
+14 -1
usr.sbin/dhcpd/convert.c
··· 1 - /* $OpenBSD: convert.c,v 1.4 2004/05/04 21:25:27 deraadt Exp $ */ 1 + /* $OpenBSD: convert.c,v 1.5 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * Safe copying of option values into and out of the option buffer, ··· 43 43 * Enterprises, see ``http://www.vix.com''. 44 44 */ 45 45 46 + #include <sys/types.h> 47 + #include <sys/socket.h> 48 + 49 + #include <net/if.h> 50 + 51 + #include <netinet/in.h> 52 + 53 + #include <stdio.h> 54 + #include <stdlib.h> 55 + #include <string.h> 56 + 57 + #include "dhcp.h" 58 + #include "tree.h" 46 59 #include "dhcpd.h" 47 60 48 61 u_int32_t
+14 -1
usr.sbin/dhcpd/db.c
··· 1 - /* $OpenBSD: db.c,v 1.14 2014/02/08 18:12:17 krw Exp $ */ 1 + /* $OpenBSD: db.c,v 1.15 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * Persistent database management routines for DHCPD. ··· 42 42 * Enterprises, see ``http://www.vix.com''. 43 43 */ 44 44 45 + #include <sys/types.h> 46 + #include <sys/socket.h> 47 + 48 + #include <net/if.h> 49 + 50 + #include <netinet/in.h> 51 + 52 + #include <fcntl.h> 53 + #include <stdio.h> 54 + #include <unistd.h> 55 + 56 + #include "dhcp.h" 57 + #include "tree.h" 45 58 #include "dhcpd.h" 46 59 47 60 FILE *db_file;
+17 -1
usr.sbin/dhcpd/dhcp.c
··· 1 - /* $OpenBSD: dhcp.c,v 1.44 2015/12/21 21:39:11 mmcc Exp $ */ 1 + /* $OpenBSD: dhcp.c,v 1.45 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1995, 1996, 1997, 1998, 1999 ··· 38 38 * Enterprises, see ``http://www.vix.com''. 39 39 */ 40 40 41 + #include <sys/types.h> 42 + #include <sys/socket.h> 43 + 44 + #include <arpa/inet.h> 45 + 46 + #include <net/if.h> 47 + 48 + #include <netinet/in.h> 49 + 50 + #include <errno.h> 51 + #include <stdio.h> 52 + #include <stdlib.h> 53 + #include <string.h> 54 + 55 + #include "dhcp.h" 56 + #include "tree.h" 41 57 #include "dhcpd.h" 42 58 #include "sync.h" 43 59
+20 -3
usr.sbin/dhcpd/dhcpd.c
··· 1 - /* $OpenBSD: dhcpd.c,v 1.49 2015/12/14 01:08:50 krw Exp $ */ 1 + /* $OpenBSD: dhcpd.c,v 1.50 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 2004 Henning Brauer <henning@cvs.openbsd.org> ··· 39 39 * Enterprises, see ``http://www.vix.com''. 40 40 */ 41 41 42 + #include <sys/types.h> 43 + #include <sys/socket.h> 44 + 45 + #include <net/if.h> 46 + 47 + #include <arpa/inet.h> 48 + 49 + #include <err.h> 50 + #include <netdb.h> 51 + #include <paths.h> 52 + #include <pwd.h> 53 + #include <stdio.h> 54 + #include <stdlib.h> 55 + #include <string.h> 56 + #include <syslog.h> 57 + #include <unistd.h> 58 + 59 + #include "dhcp.h" 60 + #include "tree.h" 42 61 #include "dhcpd.h" 43 62 #include "sync.h" 44 63 45 - #include <err.h> 46 - #include <pwd.h> 47 64 48 65 __dead void usage(void); 49 66
+1 -32
usr.sbin/dhcpd/dhcpd.h
··· 1 - /* $OpenBSD: dhcpd.h,v 1.52 2014/07/11 16:48:29 yasuoka Exp $ */ 1 + /* $OpenBSD: dhcpd.h,v 1.53 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1995, 1996, 1997, 1998, 1999 ··· 38 38 * Enterprises, see ``http://www.vix.com''. 39 39 */ 40 40 41 - #include <sys/types.h> 42 - #include <sys/socket.h> 43 - #include <sys/stat.h> 44 - #include <sys/wait.h> 45 - #include <sys/sockio.h> 46 - #include <sys/time.h> 47 - 48 - #include <net/if.h> 49 - #include <net/if_dl.h> 50 - #include <net/route.h> 51 - 52 - #include <netinet/in.h> 53 - #include <arpa/inet.h> 54 - 55 - #include <ctype.h> 56 - #include <errno.h> 57 - #include <fcntl.h> 58 - #include <limits.h> 59 - #include <netdb.h> 60 - #include <paths.h> 61 - #include <stdarg.h> 62 - #include <stdio.h> 63 - #include <stdlib.h> 64 - #include <string.h> 65 - #include <syslog.h> 66 - #include <time.h> 67 - #include <unistd.h> 68 - 69 41 #define ifr_netmask ifr_addr 70 42 71 43 #define HAVE_SA_LEN 72 44 #define HAVE_MKSTEMP 73 - 74 - #include "dhcp.h" 75 - #include "tree.h" 76 45 77 46 #define DB_TIMEFMT "%w %Y/%m/%d %T UTC" 78 47 #define OLD_DB_TIMEFMT "%w %Y/%m/%d %T"
+25 -5
usr.sbin/dhcpd/dispatch.c
··· 1 - /* $OpenBSD: dispatch.c,v 1.35 2015/08/20 22:39:29 deraadt Exp $ */ 1 + /* $OpenBSD: dispatch.c,v 1.36 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1995, 1996, 1997, 1998, 1999 ··· 38 38 * Enterprises, see ``http://www.vix.com''. 39 39 */ 40 40 41 - #include "dhcpd.h" 42 - #include "sync.h" 43 - #include <ifaddrs.h> 41 + #include <sys/types.h> 44 42 #include <sys/ioctl.h> 45 - #include <poll.h> 43 + #include <sys/socket.h> 44 + 45 + #include <arpa/inet.h> 46 + 47 + #include <net/if.h> 48 + #include <net/if_dl.h> 46 49 #include <net/if_media.h> 50 + 51 + #include <netinet/in.h> 52 + 53 + #include <errno.h> 54 + #include <ifaddrs.h> 55 + #include <limits.h> 56 + #include <poll.h> 57 + #include <stdio.h> 58 + #include <stdlib.h> 59 + #include <string.h> 60 + #include <syslog.h> 61 + #include <unistd.h> 62 + 63 + #include "dhcp.h" 64 + #include "tree.h" 65 + #include "dhcpd.h" 66 + #include "sync.h" 47 67 48 68 extern int syncfd; 49 69
+15 -3
usr.sbin/dhcpd/errwarn.c
··· 1 - /* $OpenBSD: errwarn.c,v 1.8 2008/05/07 12:19:20 beck Exp $ */ 1 + /* $OpenBSD: errwarn.c,v 1.9 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* Errors and warnings... */ 4 4 ··· 41 41 */ 42 42 43 43 #include <sys/types.h> 44 - #include <sys/uio.h> 45 - #include <unistd.h> 44 + #include <sys/socket.h> 45 + 46 + #include <net/if.h> 47 + 48 + #include <netinet/in.h> 49 + 46 50 #include <errno.h> 51 + #include <stdarg.h> 52 + #include <stdio.h> 53 + #include <stdlib.h> 54 + #include <string.h> 55 + #include <syslog.h> 56 + #include <unistd.h> 47 57 58 + #include "dhcp.h" 59 + #include "tree.h" 48 60 #include "dhcpd.h" 49 61 50 62 static void do_percentm(char *obuf, size_t size, char *ibuf);
+14 -1
usr.sbin/dhcpd/hash.c
··· 1 - /* $OpenBSD: hash.c,v 1.6 2010/01/01 20:30:25 krw Exp $ */ 1 + /* $OpenBSD: hash.c,v 1.7 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* Routines for manipulating hash tables... */ 4 4 ··· 40 40 * Enterprises, see ``http://www.vix.com''. 41 41 */ 42 42 43 + #include <sys/types.h> 44 + #include <sys/socket.h> 45 + 46 + #include <net/if.h> 47 + 48 + #include <netinet/in.h> 49 + 50 + #include <stdio.h> 51 + #include <stdlib.h> 52 + #include <string.h> 53 + 54 + #include "dhcp.h" 55 + #include "tree.h" 43 56 #include "dhcpd.h" 44 57 45 58 static int do_hash(unsigned char *, int, int);
+17 -2
usr.sbin/dhcpd/icmp.c
··· 1 - /* $OpenBSD: icmp.c,v 1.13 2014/10/25 03:23:49 lteo Exp $ */ 1 + /* $OpenBSD: icmp.c,v 1.14 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1997, 1998 The Internet Software Consortium. ··· 38 38 * Enterprises, see ``http://www.vix.com''. 39 39 */ 40 40 41 - #include "dhcpd.h" 41 + #include <sys/types.h> 42 + #include <sys/socket.h> 43 + 44 + #include <arpa/inet.h> 45 + 46 + #include <net/if.h> 47 + 42 48 #include <netinet/ip.h> 43 49 #include <netinet/ip_icmp.h> 50 + 51 + #include <netdb.h> 52 + #include <stdio.h> 53 + #include <string.h> 54 + #include <unistd.h> 55 + 56 + #include "dhcp.h" 57 + #include "tree.h" 58 + #include "dhcpd.h" 44 59 45 60 static int icmp_protocol_initialized; 46 61 static int icmp_protocol_fd;
+15 -1
usr.sbin/dhcpd/inet.c
··· 1 - /* $OpenBSD: inet.c,v 1.5 2004/09/16 21:27:44 claudio Exp $ */ 1 + /* $OpenBSD: inet.c,v 1.6 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * Subroutines to manipulate internet addresses in a safely portable ··· 42 42 * Enterprises, see ``http://www.vix.com''. 43 43 */ 44 44 45 + #include <sys/types.h> 46 + #include <sys/socket.h> 47 + 48 + #include <arpa/inet.h> 49 + 50 + #include <net/if.h> 51 + 52 + #include <netinet/in.h> 53 + 54 + #include <stdio.h> 55 + #include <string.h> 56 + 57 + #include "dhcp.h" 58 + #include "tree.h" 45 59 #include "dhcpd.h" 46 60 47 61 /*
+15 -1
usr.sbin/dhcpd/memory.c
··· 1 - /* $OpenBSD: memory.c,v 1.23 2015/02/10 23:06:13 krw Exp $ */ 1 + /* $OpenBSD: memory.c,v 1.24 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. ··· 38 38 * Enterprises, see ``http://www.vix.com''. 39 39 */ 40 40 41 + #include <sys/types.h> 42 + #include <sys/socket.h> 43 + 44 + #include <arpa/inet.h> 45 + 46 + #include <net/if.h> 47 + 48 + #include <netdb.h> 49 + #include <stdio.h> 50 + #include <stdlib.h> 51 + #include <string.h> 52 + 53 + #include "dhcp.h" 54 + #include "tree.h" 41 55 #include "dhcpd.h" 42 56 #include "sync.h" 43 57
+13 -2
usr.sbin/dhcpd/options.c
··· 1 - /* $OpenBSD: options.c,v 1.29 2015/06/27 14:29:39 krw Exp $ */ 1 + /* $OpenBSD: options.c,v 1.30 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* DHCP options parsing and reassembly. */ 4 4 ··· 40 40 * Enterprises, see ``http://www.vix.com''. 41 41 */ 42 42 43 - #include <ctype.h> 43 + #include <sys/types.h> 44 + #include <sys/socket.h> 45 + 46 + #include <net/if.h> 47 + 48 + #include <netinet/in.h> 49 + 50 + #include <stdio.h> 51 + #include <stdlib.h> 52 + #include <string.h> 44 53 54 + #include "dhcp.h" 55 + #include "tree.h" 45 56 #include "dhcpd.h" 46 57 47 58 int bad_options = 0;
+13 -2
usr.sbin/dhcpd/packet.c
··· 1 - /* $OpenBSD: packet.c,v 1.10 2016/02/03 14:48:36 krw Exp $ */ 1 + /* $OpenBSD: packet.c,v 1.11 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* Packet assembly code, originally contributed by Archie Cobbs. */ 4 4 ··· 40 40 * Enterprises, see ``http://www.vix.com''. 41 41 */ 42 42 43 - #include "dhcpd.h" 43 + #include <sys/types.h> 44 + #include <sys/socket.h> 45 + 46 + #include <net/if.h> 44 47 48 + #include <netinet/in.h> 45 49 #include <netinet/ip.h> 46 50 #include <netinet/udp.h> 47 51 #include <netinet/if_ether.h> 52 + 53 + #include <stdio.h> 54 + #include <string.h> 55 + 56 + #include "dhcp.h" 57 + #include "tree.h" 58 + #include "dhcpd.h" 48 59 49 60 u_int32_t checksum(unsigned char *, unsigned, u_int32_t); 50 61 u_int32_t wrapsum(u_int32_t);
+15 -2
usr.sbin/dhcpd/parse.c
··· 1 - /* $OpenBSD: parse.c,v 1.19 2015/12/11 14:09:48 krw Exp $ */ 1 + /* $OpenBSD: parse.c,v 1.20 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* Common parser code for dhcpd and dhclient. */ 4 4 ··· 40 40 * Enterprises, see ``http://www.vix.com''. 41 41 */ 42 42 43 - #include <stdint.h> 43 + #include <sys/types.h> 44 + #include <sys/socket.h> 45 + 46 + #include <net/if.h> 47 + 48 + #include <netinet/in.h> 49 + 50 + #include <ctype.h> 51 + #include <stdint.h> 52 + #include <stdio.h> 53 + #include <stdlib.h> 54 + #include <string.h> 44 55 56 + #include "dhcp.h" 57 + #include "tree.h" 45 58 #include "dhcpd.h" 46 59 #include "dhctoken.h" 47 60
+4 -5
usr.sbin/dhcpd/pfutils.c
··· 1 - /* $OpenBSD: pfutils.c,v 1.13 2015/02/05 09:42:52 krw Exp $ */ 1 + /* $OpenBSD: pfutils.c,v 1.14 2016/02/06 23:50:10 krw Exp $ */ 2 2 /* 3 3 * Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org> 4 4 * ··· 18 18 #include <sys/types.h> 19 19 #include <sys/ioctl.h> 20 20 #include <sys/socket.h> 21 - #include <sys/time.h> 22 21 23 22 #include <netinet/in.h> 24 - #include <arpa/inet.h> 25 23 #include <net/if.h> 26 24 #include <net/pfvar.h> 27 25 28 - #include <ctype.h> 29 - #include <err.h> 30 26 #include <errno.h> 31 27 #include <fcntl.h> 28 + #include <paths.h> 32 29 #include <poll.h> 33 30 #include <pwd.h> 34 31 #include <stdio.h> ··· 36 33 #include <string.h> 37 34 #include <unistd.h> 38 35 36 + #include "dhcp.h" 37 + #include "tree.h" 39 38 #include "dhcpd.h" 40 39 41 40 extern struct passwd *pw;
+13 -1
usr.sbin/dhcpd/print.c
··· 1 - /* $OpenBSD: print.c,v 1.10 2005/11/13 20:25:59 deraadt Exp $ */ 1 + /* $OpenBSD: print.c,v 1.11 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* Turn data structures into printable text. */ 4 4 ··· 40 40 * Enterprises, see ``http://www.vix.com''. 41 41 */ 42 42 43 + #include <sys/types.h> 44 + #include <sys/socket.h> 45 + 46 + #include <net/if.h> 47 + 48 + #include <netinet/in.h> 49 + 50 + #include <stdio.h> 51 + #include <string.h> 52 + 53 + #include "dhcp.h" 54 + #include "tree.h" 43 55 #include "dhcpd.h" 44 56 45 57 char *
+13 -18
usr.sbin/dhcpd/sync.c
··· 1 - /* $OpenBSD: sync.c,v 1.16 2015/01/16 06:40:16 deraadt Exp $ */ 1 + /* $OpenBSD: sync.c,v 1.17 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 2008 Bob Beck <beck@openbsd.org> ··· 17 17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 18 18 */ 19 19 20 - #include <sys/stdint.h> 21 - #include <sys/file.h> 22 - #include <sys/wait.h> 23 - #include <sys/socket.h> 24 - #include <sys/resource.h> 25 - #include <sys/uio.h> 20 + #include <sys/types.h> 26 21 #include <sys/ioctl.h> 27 22 #include <sys/queue.h> 23 + #include <sys/socket.h> 28 24 25 + #include <net/if.h> 26 + 27 + #include <arpa/inet.h> 29 28 30 - #include <net/if.h> 31 29 #include <netinet/in.h> 32 - #include <arpa/inet.h> 30 + 31 + #include <openssl/hmac.h> 33 32 34 - #include <err.h> 35 33 #include <errno.h> 36 - #include <pwd.h> 37 - #include <stdio.h> 38 - #include <stdlib.h> 34 + #include <netdb.h> 35 + #include <sha1.h> 39 36 #include <string.h> 37 + #include <syslog.h> 40 38 #include <unistd.h> 41 - #include <sha1.h> 42 39 43 - #include <netdb.h> 44 - 45 - #include <openssl/hmac.h> 46 - 40 + #include "dhcp.h" 41 + #include "tree.h" 47 42 #include "dhcpd.h" 48 43 #include "sync.h" 49 44
+12 -1
usr.sbin/dhcpd/tables.c
··· 1 - /* $OpenBSD: tables.c,v 1.11 2015/06/27 14:29:39 krw Exp $ */ 1 + /* $OpenBSD: tables.c,v 1.12 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* Tables of information... */ 4 4 ··· 40 40 * Enterprises, see ``http://www.vix.com''. 41 41 */ 42 42 43 + #include <sys/types.h> 44 + #include <sys/socket.h> 45 + 46 + #include <net/if.h> 47 + 48 + #include <netinet/in.h> 49 + 50 + #include <stdio.h> 51 + 52 + #include "dhcp.h" 53 + #include "tree.h" 43 54 #include "dhcpd.h" 44 55 45 56 /*
+14 -1
usr.sbin/dhcpd/tree.c
··· 1 - /* $OpenBSD: tree.c,v 1.16 2015/12/21 21:39:11 mmcc Exp $ */ 1 + /* $OpenBSD: tree.c,v 1.17 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* Routines for manipulating parse trees... */ 4 4 ··· 40 40 * Enterprises, see ``http://www.vix.com''. 41 41 */ 42 42 43 + #include <sys/types.h> 44 + #include <sys/socket.h> 45 + 46 + #include <net/if.h> 47 + 48 + #include <netinet/in.h> 49 + 50 + #include <stdio.h> 51 + #include <stdlib.h> 52 + #include <string.h> 53 + 54 + #include "dhcp.h" 55 + #include "tree.h" 43 56 #include "dhcpd.h" 44 57 45 58 static time_t tree_evaluate_recurse(int *, unsigned char **, int *,
+14 -5
usr.sbin/dhcpd/udpsock.c
··· 1 - /* $OpenBSD: udpsock.c,v 1.3 2015/12/14 01:08:50 krw Exp $ */ 1 + /* $OpenBSD: udpsock.c,v 1.4 2016/02/06 23:50:10 krw Exp $ */ 2 2 3 3 /* 4 4 * Copyright (c) 2014 YASUOKA Masahiko <yasuoka@openbsd.org> ··· 17 17 */ 18 18 19 19 #include <sys/param.h> /* nitems */ 20 + #include <sys/ioctl.h> 20 21 #include <sys/socket.h> 21 - #include <sys/uio.h> 22 - #include <sys/ioctl.h> 22 + 23 + #include <arpa/inet.h> 24 + 25 + #include <net/if.h> 26 + #include <net/if_dl.h> 27 + 23 28 #include <netinet/in.h> 24 - #include <arpa/inet.h> 25 29 30 + #include <ctype.h> 26 31 #include <errno.h> 27 - #include <stdint.h> 32 + #include <stdio.h> 33 + #include <stdlib.h> 28 34 #include <string.h> 35 + #include <unistd.h> 29 36 37 + #include "dhcp.h" 38 + #include "tree.h" 30 39 #include "dhcpd.h" 31 40 32 41 void udpsock_handler (struct protocol *);