1 files changed, 186 insertions, 161 deletions

diff --git a/release/src/router/busybox/networking/udhcp/dhcpd.c b/release/src/router/busybox/networking/udhcp/dhcpd.c
index c21cb72a..a82fd8c4 100644
--- a/release/src/router/busybox/networking/udhcp/dhcpd.c
+++ b/release/src/router/busybox/networking/udhcp/dhcpd.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* dhcpd.c
  *
  * udhcp Server
@@ -6,248 +7,272 @@
  *
  * Rewrite by Russ Dill <Russ.Dill@asu.edu> July 2001
  *
- * 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.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <fcntl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/wait.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <signal.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <time.h>
-#include <sys/time.h>
-
+#include <syslog.h>
+#include "common.h"
+#include "dhcpc.h"
 #include "dhcpd.h"
-#include "arpping.h"
-#include "socket.h"
 #include "options.h"
-#include "files.h"
-#include "serverpacket.h"
-#include "common.h"
 
 
 /* globals */
 struct dhcpOfferedAddr *leases;
-struct server_config_t server_config;
+/* struct server_config_t server_config is in bb_common_bufsiz1 */
 
 
-int udhcpd_main(int argc, char *argv[])
-{	
+int udhcpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int udhcpd_main(int argc UNUSED_PARAM, char **argv)
+{
 	fd_set rfds;
-	struct timeval tv;
-	int server_socket = -1;
-	int bytes, retval;
+	int server_socket = -1, retval, max_sock;
 	struct dhcpMessage packet;
-	unsigned char *state;
-	unsigned char *server_id, *requested;
-	u_int32_t server_id_align, requested_align;
-	unsigned long timeout_end;
+	uint8_t *state, *server_id, *requested;
+	uint32_t server_id_aligned = server_id_aligned; /* for compiler */
+	uint32_t requested_aligned = requested_aligned;
+	uint32_t static_lease_ip;
+	unsigned timeout_end;
+	unsigned num_ips;
+	unsigned opt;
 	struct option_set *option;
-	struct dhcpOfferedAddr *lease;
-	int max_sock;
-	int sig;
-	unsigned long num_ips;
-	
-	start_log("server");
-
-	memset(&server_config, 0, sizeof(struct server_config_t));
-	
-	if (argc < 2)
-		read_config(DHCPD_CONF_FILE);
-	else read_config(argv[1]);
-
-	if ((option = find_option(server_config.options, DHCP_LEASE_TIME))) {
-		memcpy(&server_config.lease, option->data + 2, 4);
+	struct dhcpOfferedAddr *lease, static_lease;
+	USE_FEATURE_UDHCP_PORT(char *str_P;)
+
+#if ENABLE_FEATURE_UDHCP_PORT
+	SERVER_PORT = 67;
+	CLIENT_PORT = 68;
+#endif
+
+	opt = getopt32(argv, "fS" USE_FEATURE_UDHCP_PORT("P:", &str_P));
+	argv += optind;
+	if (!(opt & 1)) { /* no -f */
+		bb_daemonize_or_rexec(0, argv);
+		logmode = LOGMODE_NONE;
+	}
+	if (opt & 2) { /* -S */
+		openlog(applet_name, LOG_PID, LOG_DAEMON);
+		logmode |= LOGMODE_SYSLOG;
+	}
+#if ENABLE_FEATURE_UDHCP_PORT
+	if (opt & 4) { /* -P */
+		SERVER_PORT = xatou16(str_P);
+		CLIENT_PORT = SERVER_PORT + 1;
+	}
+#endif
+	/* Would rather not do read_config before daemonization -
+	 * otherwise NOMMU machines will parse config twice */
+	read_config(argv[0] ? argv[0] : DHCPD_CONF_FILE);
+
+	/* Make sure fd 0,1,2 are open */
+	bb_sanitize_stdio();
+	/* Equivalent of doing a fflush after every \n */
+	setlinebuf(stdout);
+
+	/* Create pidfile */
+	write_pidfile(server_config.pidfile);
+	/* if (!..) bb_perror_msg("cannot create pidfile %s", pidfile); */
+
+	bb_info_msg("%s (v"BB_VER") started", applet_name);
+
+	option = find_option(server_config.options, DHCP_LEASE_TIME);
+	server_config.lease = LEASE_TIME;
+	if (option) {
+		move_from_unaligned32(server_config.lease, option->data + 2);
 		server_config.lease = ntohl(server_config.lease);
 	}
-	else server_config.lease = LEASE_TIME;
-	
+
 	/* Sanity check */
-	num_ips = ntohl(server_config.end) - ntohl(server_config.start);
+	num_ips = server_config.end_ip - server_config.start_ip + 1;
 	if (server_config.max_leases > num_ips) {
-		LOG(LOG_ERR, "max_leases value (%lu) not sane, "
-			"setting to %lu instead",
-			server_config.max_leases, num_ips);
+		bb_error_msg("max_leases=%u is too big, setting to %u",
+			(unsigned)server_config.max_leases, num_ips);
 		server_config.max_leases = num_ips;
 	}
 
-	leases = xcalloc(sizeof(struct dhcpOfferedAddr), server_config.max_leases);
+	leases = xzalloc(server_config.max_leases * sizeof(*leases));
 	read_leases(server_config.lease_file);
 
-	if (read_interface(server_config.interface, &server_config.ifindex,
-			   &server_config.server, server_config.arp) < 0)
-		return(1);
-
-#ifndef CONFIG_FEATURE_UDHCP_DEBUG
-	background(server_config.pidfile);
-#endif
+	if (udhcp_read_interface(server_config.interface, &server_config.ifindex,
+			   &server_config.server, server_config.arp)) {
+		retval = 1;
+		goto ret;
+	}
 
-	udhcp_set_signal_pipe(0);
+	/* Setup the signal pipe */
+	udhcp_sp_setup();
 
-	timeout_end = time(0) + server_config.auto_time;
-	while(1) { /* loop until universe collapses */
+	timeout_end = monotonic_sec() + server_config.auto_time;
+	while (1) { /* loop until universe collapses */
+		int bytes;
+		struct timeval tv;
 
-		if (server_socket < 0)
-			if ((server_socket = listen_socket(INADDR_ANY, SERVER_PORT, server_config.interface)) < 0) {
-				LOG(LOG_ERR, "FATAL: couldn't create server socket, %m");
-				return(2);
-			}			
+		if (server_socket < 0) {
+			server_socket = udhcp_listen_socket(/*INADDR_ANY,*/ SERVER_PORT,
+					server_config.interface);
+		}
 
-		FD_ZERO(&rfds);
-		FD_SET(server_socket, &rfds);
-		FD_SET(udhcp_signal_pipe[0], &rfds);
+		max_sock = udhcp_sp_fd_set(&rfds, server_socket);
 		if (server_config.auto_time) {
-			tv.tv_sec = timeout_end - time(0);
+			tv.tv_sec = timeout_end - monotonic_sec();
 			tv.tv_usec = 0;
 		}
+		retval = 0;
 		if (!server_config.auto_time || tv.tv_sec > 0) {
-			max_sock = server_socket > udhcp_signal_pipe[0] ? server_socket : udhcp_signal_pipe[0];
-			retval = select(max_sock + 1, &rfds, NULL, NULL, 
+			retval = select(max_sock + 1, &rfds, NULL, NULL,
 					server_config.auto_time ? &tv : NULL);
-		} else retval = 0; /* If we already timed out, fall through */
-
+		}
 		if (retval == 0) {
 			write_leases();
-			timeout_end = time(0) + server_config.auto_time;
+			timeout_end = monotonic_sec() + server_config.auto_time;
 			continue;
-		} else if (retval < 0 && errno != EINTR) {
-			DEBUG(LOG_INFO, "error on select");
+		}
+		if (retval < 0 && errno != EINTR) {
+			DEBUG("error on select");
 			continue;
 		}
-		
-		if (FD_ISSET(udhcp_signal_pipe[0], &rfds)) {
-			if (read(udhcp_signal_pipe[0], &sig, sizeof(sig)) < 0)
-				continue; /* probably just EINTR */
-			switch (sig) {
-			case SIGUSR1:
-				LOG(LOG_INFO, "Received a SIGUSR1");
-				write_leases();
-				/* why not just reset the timeout, eh */
-				timeout_end = time(0) + server_config.auto_time;
-				continue;
-			case SIGTERM:
-				LOG(LOG_INFO, "Received a SIGTERM");
-				return(0);
-			}
+
+		switch (udhcp_sp_read(&rfds)) {
+		case SIGUSR1:
+			bb_info_msg("Received a SIGUSR1");
+			write_leases();
+			/* why not just reset the timeout, eh */
+			timeout_end = monotonic_sec() + server_config.auto_time;
+			continue;
+		case SIGTERM:
+			bb_info_msg("Received a SIGTERM");
+			goto ret0;
+		case 0:	/* no signal: read a packet */
+			break;
+		default: /* signal or error (probably EINTR): back to select */
+			continue;
 		}
 
-		if ((bytes = get_packet(&packet, server_socket)) < 0) { /* this waits for a packet - idle */
+		bytes = udhcp_recv_kernel_packet(&packet, server_socket);
+		if (bytes < 0) {
+			/* bytes can also be -2 ("bad packet data") */
 			if (bytes == -1 && errno != EINTR) {
-				DEBUG(LOG_INFO, "error on read, %m, reopening socket");
+				DEBUG("error on read, %s, reopening socket", strerror(errno));
 				close(server_socket);
 				server_socket = -1;
 			}
 			continue;
 		}
 
-		if ((state = get_option(&packet, DHCP_MESSAGE_TYPE)) == NULL) {
-			DEBUG(LOG_ERR, "couldn't get option from packet, ignoring");
+		state = get_option(&packet, DHCP_MESSAGE_TYPE);
+		if (state == NULL) {
+			bb_error_msg("cannot get option from packet, ignoring");
 			continue;
 		}
-		
-		/* ADDME: look for a static lease */
-		lease = find_lease_by_chaddr(packet.chaddr);
+
+		/* Look for a static lease */
+		static_lease_ip = getIpByMac(server_config.static_leases, &packet.chaddr);
+		if (static_lease_ip) {
+			bb_info_msg("Found static lease: %x", static_lease_ip);
+
+			memcpy(&static_lease.chaddr, &packet.chaddr, 16);
+			static_lease.yiaddr = static_lease_ip;
+			static_lease.expires = 0;
+
+			lease = &static_lease;
+		} else {
+			lease = find_lease_by_chaddr(packet.chaddr);
+		}
+
 		switch (state[0]) {
 		case DHCPDISCOVER:
-			DEBUG(LOG_INFO,"received DISCOVER");
-			
-			if (sendOffer(&packet) < 0) {
-				LOG(LOG_ERR, "send OFFER failed");
+			DEBUG("Received DISCOVER");
+
+			if (send_offer(&packet) < 0) {
+				bb_error_msg("send OFFER failed");
 			}
-			break;			
- 		case DHCPREQUEST:
-			DEBUG(LOG_INFO, "received REQUEST");
+			break;
+		case DHCPREQUEST:
+			DEBUG("received REQUEST");
 
 			requested = get_option(&packet, DHCP_REQUESTED_IP);
 			server_id = get_option(&packet, DHCP_SERVER_ID);
 
-			if (requested) memcpy(&requested_align, requested, 4);
-			if (server_id) memcpy(&server_id_align, server_id, 4);
-		
-			if (lease) { /*ADDME: or static lease */
+			if (requested)
+				move_from_unaligned32(requested_aligned, requested);
+			if (server_id)
+				move_from_unaligned32(server_id_aligned, server_id);
+
+			if (lease) {
 				if (server_id) {
 					/* SELECTING State */
-					DEBUG(LOG_INFO, "server_id = %08x", ntohl(server_id_align));
-					if (server_id_align == server_config.server && requested && 
-					    requested_align == lease->yiaddr) {
-						sendACK(&packet, lease->yiaddr);
+					DEBUG("server_id = %08x", ntohl(server_id_aligned));
+					if (server_id_aligned == server_config.server
+					 && requested
+					 && requested_aligned == lease->yiaddr
+					) {
+						send_ACK(&packet, lease->yiaddr);
 					}
-				} else {
-					if (requested) {
-						/* INIT-REBOOT State */
-						if (lease->yiaddr == requested_align)
-							sendACK(&packet, lease->yiaddr);
-						else sendNAK(&packet);
-					} else {
-						/* RENEWING or REBINDING State */
-						if (lease->yiaddr == packet.ciaddr)
-							sendACK(&packet, lease->yiaddr);
-						else {
-							/* don't know what to do!!!! */
-							sendNAK(&packet);
-						}
-					}						
+				} else if (requested) {
+					/* INIT-REBOOT State */
+					if (lease->yiaddr == requested_aligned)
+						send_ACK(&packet, lease->yiaddr);
+					else
+						send_NAK(&packet);
+				} else if (lease->yiaddr == packet.ciaddr) {
+					/* RENEWING or REBINDING State */
+					send_ACK(&packet, lease->yiaddr);
+				} else { /* don't know what to do!!!! */
+					send_NAK(&packet);
 				}
-			
+
 			/* what to do if we have no record of the client */
 			} else if (server_id) {
 				/* SELECTING State */
 
 			} else if (requested) {
 				/* INIT-REBOOT State */
-				if ((lease = find_lease_by_yiaddr(requested_align))) {
+				lease = find_lease_by_yiaddr(requested_aligned);
+				if (lease) {
 					if (lease_expired(lease)) {
 						/* probably best if we drop this lease */
 						memset(lease->chaddr, 0, 16);
 					/* make some contention for this address */
-					} else sendNAK(&packet);
-				} else if (requested_align < server_config.start || 
-					   requested_align > server_config.end) {
-					sendNAK(&packet);
-				} /* else remain silent */
+					} else
+						send_NAK(&packet);
+				} else {
+					uint32_t r = ntohl(requested_aligned);
+					if (r < server_config.start_ip
+				         || r > server_config.end_ip
+					) {
+						send_NAK(&packet);
+					}
+					/* else remain silent */
+				}
 
 			} else {
-				 /* RENEWING or REBINDING State */
+				/* RENEWING or REBINDING State */
 			}
 			break;
 		case DHCPDECLINE:
-			DEBUG(LOG_INFO,"received DECLINE");
+			DEBUG("Received DECLINE");
 			if (lease) {
 				memset(lease->chaddr, 0, 16);
-				lease->expires = time(0) + server_config.decline_time;
-			}			
+				lease->expires = time(NULL) + server_config.decline_time;
+			}
 			break;
 		case DHCPRELEASE:
-			DEBUG(LOG_INFO,"received RELEASE");
-			if (lease) lease->expires = time(0);
+			DEBUG("Received RELEASE");
+			if (lease)
+				lease->expires = time(NULL);
 			break;
 		case DHCPINFORM:
-			DEBUG(LOG_INFO,"received INFORM");
+			DEBUG("Received INFORM");
 			send_inform(&packet);
-			break;	
+			break;
 		default:
-			LOG(LOG_WARNING, "unsupported DHCP message (%02x) -- ignoring", state[0]);
+			bb_info_msg("Unsupported DHCP message (%02x) - ignoring", state[0]);
 		}
 	}
-
-	return 0;
+ ret0:
+	retval = 0;
+ ret:
+	/*if (server_config.pidfile) - server_config.pidfile is never NULL */
+		remove_pidfile(server_config.pidfile);
+	return retval;
 }