svn commit: trunk/busybox/networking/udhcp

[vda at busybox.net]

Author: vda
Date: 2006-11-27 16:21:46 -0800 (Mon, 27 Nov 2006)
New Revision: 16699

Log:
udhcpc: fix my breakage


Modified:
   trunk/busybox/networking/udhcp/script.c
   trunk/busybox/networking/udhcp/socket.c


Changeset:
Modified: trunk/busybox/networking/udhcp/script.c
===================================================================
--- trunk/busybox/networking/udhcp/script.c	2006-11-28 00:06:39 UTC (rev 16698)
+++ trunk/busybox/networking/udhcp/script.c	2006-11-28 00:21:46 UTC (rev 16699)
@@ -151,10 +151,9 @@
 	envp[j] = xmalloc(sizeof("ip=255.255.255.255"));
 	sprintip(envp[j++], "ip=", (uint8_t *) &packet->yiaddr);
 
-
 	for (i = 0; dhcp_options[i].code; i++) {
 		temp = get_option(packet, dhcp_options[i].code);
-		if (temp)
+		if (!temp)
 			continue;
 		envp[j] = xmalloc(upper_length(temp[OPT_LEN - 2],
 			dhcp_options[i].flags & TYPE_MASK) + strlen(dhcp_options[i].name) + 2);
@@ -205,7 +204,6 @@
 		return;
 	} else if (pid == 0) {
 		/* close fd's? */
-
 		/* exec script */
 		execle(client_config.script, client_config.script,
 		       name, NULL, envp);

Modified: trunk/busybox/networking/udhcp/socket.c
===================================================================
--- trunk/busybox/networking/udhcp/socket.c	2006-11-28 00:06:39 UTC (rev 16698)
+++ trunk/busybox/networking/udhcp/socket.c	2006-11-28 00:21:46 UTC (rev 16699)
@@ -53,7 +53,7 @@
 	ifr.ifr_addr.sa_family = AF_INET;
 	strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name));
 	if (addr) {
-		if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) {
+		if (ioctl(fd, SIOCGIFADDR, &ifr) != 0) {
 			bb_perror_msg("SIOCGIFADDR failed, is the interface up and configured?");
 			close(fd);
 			return -1;
@@ -64,7 +64,7 @@
 	}
 
 	if (ifindex) {
-		if (ioctl(fd, SIOCGIFINDEX, &ifr) == 0) {
+		if (ioctl(fd, SIOCGIFINDEX, &ifr) != 0) {
 			bb_perror_msg("SIOCGIFINDEX failed");
 			close(fd);
 			return -1;