From 147e2d0fd97979d2f76dec4b3f65f4c198c8ea4f Mon Sep 17 00:00:00 2001 From: "Nicholas J. Kain" Date: Wed, 30 Mar 2011 23:33:46 -0400 Subject: [PATCH] Untabify and headerize config.h. --- ndhc/config.h | 78 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 29 deletions(-) diff --git a/ndhc/config.h b/ndhc/config.h index 5ea9e73..b0a8f79 100644 --- a/ndhc/config.h +++ b/ndhc/config.h @@ -1,5 +1,25 @@ -#ifndef DHCPC_H_ -#define DHCPC_H_ +/* config.h - internal configuration and state for ndhc + * Time-stamp: <2011-03-30 23:33:07 nk> + * + * (c) 2004-2011 Nicholas J. Kain + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef NDHC_CONFIG_H_ +#define NDHC_CONFIG_H_ #include @@ -7,16 +27,16 @@ #define RETRY_DELAY 30 /* time in seconds to delay after sending NUMPACKETS */ enum { - DS_NULL = 0, - DS_INIT_SELECTING, - DS_REQUESTING, - DS_BOUND, - DS_RENEWING, - DS_REBINDING, - DS_ARP_GW_CHECK, - DS_ARP_CHECK, - DS_RENEW_REQUESTED, - DS_RELEASED + DS_NULL = 0, + DS_INIT_SELECTING, + DS_REQUESTING, + DS_BOUND, + DS_RENEWING, + DS_REBINDING, + DS_ARP_GW_CHECK, + DS_ARP_CHECK, + DS_RENEW_REQUESTED, + DS_RELEASED }; enum { @@ -26,40 +46,40 @@ enum { }; enum { - IFS_NONE = 0, - IFS_UP, - IFS_DOWN, - IFS_SHUT, - IFS_REMOVED + IFS_NONE = 0, + IFS_UP, + IFS_DOWN, + IFS_SHUT, + IFS_REMOVED }; struct client_state_t { unsigned long long leaseStartTime; int dhcpState; int arpPrevState; - int ifsPrevState; + int ifsPrevState; int listenMode; int packetNum; int epollFd, signalFd, listenFd, arpFd, nlFd; int timeout, oldTimeout; uint32_t requestedIP, serverAddr, routerAddr; uint32_t lease, t1, t2, xid; - unsigned char routerArp[6]; + uint8_t routerArp[6]; }; struct client_config_t { - char foreground; /* Do not fork */ - char quit_after_lease; /* Quit after obtaining lease */ - char abort_if_no_lease; /* Abort if no lease */ - char background_if_no_lease; /* Fork to background if no lease */ - char *interface; /* The name of the interface to use */ - unsigned char *clientid; /* Optional client id to use (unterminated) */ - unsigned char *hostname; /* Optional hostname to use (unterminated) */ - int ifindex; /* Index number of the interface to use */ - unsigned char arp[6]; /* Our arp address */ + char foreground; /* Do not fork */ + char quit_after_lease; /* Quit after obtaining lease */ + char abort_if_no_lease; /* Abort if no lease */ + char background_if_no_lease; /* Fork to background if no lease */ + char *interface; /* The name of the interface to use */ + uint8_t *clientid; /* Optional client id to use (unterminated) */ + uint8_t *hostname; /* Optional hostname to use (unterminated) */ + int ifindex; /* Index number of the interface to use */ + uint8_t arp[6]; /* Our arp address */ }; extern struct client_config_t client_config; -#endif +#endif /* NDHC_CONFIG_H_ */