diff options
| author | Denis Vlasenko | 2006-11-28 00:21:46 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2006-11-28 00:21:46 +0000 |
| commit | c2f5b022933dfcf87e4bda1e69d534f0fec918ca (patch) | |
| tree | 4a36dee53c7335d1ea32594587b03a9b01bb2eed | |
| parent | 1fffe38e01e747341cfe921b38a5cffc569e3188 (diff) | |
| download | busybox-c2f5b022933dfcf87e4bda1e69d534f0fec918ca.zip busybox-c2f5b022933dfcf87e4bda1e69d534f0fec918ca.tar.gz | |
udhcpc: fix my breakage
| -rw-r--r-- | networking/udhcp/script.c | 4 | ||||
| -rw-r--r-- | networking/udhcp/socket.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/networking/udhcp/script.c b/networking/udhcp/script.c index d44c80b..07f6836 100644 --- a/networking/udhcp/script.c +++ b/networking/udhcp/script.c @@ -151,10 +151,9 @@ static char **fill_envp(struct dhcpMessage *packet) 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 @@ void udhcp_run_script(struct dhcpMessage *packet, const char *name) return; } else if (pid == 0) { /* close fd's? */ - /* exec script */ execle(client_config.script, client_config.script, name, NULL, envp); diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c index 92bf4cc..2bae68f 100644 --- a/networking/udhcp/socket.c +++ b/networking/udhcp/socket.c @@ -53,7 +53,7 @@ int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *arp) 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 @@ int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *arp) } if (ifindex) { - if (ioctl(fd, SIOCGIFINDEX, &ifr) == 0) { + if (ioctl(fd, SIOCGIFINDEX, &ifr) != 0) { bb_perror_msg("SIOCGIFINDEX failed"); close(fd); return -1; |